Merge #2693

2693: Encapsulate inlay hints activation r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

5 files changed, 79 insertions, 301 deletions

diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts
index 325ae3da8..89af4be90 100644
--- a/editors/code/src/commands/index.ts
+++ b/editors/code/src/commands/index.ts
@@ -1,3 +1,6 @@
+import * as vscode from 'vscode';
+import * as lc from 'vscode-languageclient';
+
 import { Ctx, Cmd } from '../ctx';
 
 import { analyzerStatus } from './analyzer_status';
@@ -7,8 +10,7 @@ import { onEnter } from './on_enter';
 import { parentModule } from './parent_module';
 import { syntaxTree } from './syntax_tree';
 import { expandMacro } from './expand_macro';
-import * as inlayHints from './inlay_hints';
-import * as runnables from './runnables';
+import { run, runSingle } from './runnables';
 
 function collectGarbage(ctx: Ctx): Cmd {
     return async () => {
@@ -16,15 +18,27 @@ function collectGarbage(ctx: Ctx): Cmd {
     };
 }
 
+function showReferences(ctx: Ctx): Cmd {
+    return (uri: string, position: lc.Position, locations: lc.Location[]) => {
+        vscode.commands.executeCommand(
+            'editor.action.showReferences',
+            vscode.Uri.parse(uri),
+            ctx.client.protocol2CodeConverter.asPosition(position),
+            locations.map(ctx.client.protocol2CodeConverter.asLocation),
+        );
+    };
+}
+
 export {
     analyzerStatus,
     expandMacro,
     joinLines,
     matchingBrace,
     parentModule,
-    runnables,
     syntaxTree,
     onEnter,
-    inlayHints,
     collectGarbage,
+    run,
+    runSingle,
+    showReferences,
 };
diff --git a/editors/code/src/commands/inlay_hints.ts b/editors/code/src/commands/inlay_hints.ts
deleted file mode 100644
index ac7dcce60..000000000
--- a/editors/code/src/commands/inlay_hints.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import * as vscode from 'vscode';
-import { Range, TextDocumentChangeEvent, TextEditor } from 'vscode';
-import { TextDocumentIdentifier } from 'vscode-languageclient';
-import { Server } from '../server';
-
-interface InlayHintsParams {
-    textDocument: TextDocumentIdentifier;
-}
-
-interface InlayHint {
-    range: Range;
-    kind: string;
-    label: string;
-}
-
-const typeHintDecorationType = vscode.window.createTextEditorDecorationType({
-    after: {
-        color: new vscode.ThemeColor('ralsp.inlayHint'),
-    },
-});
-
-export class HintsUpdater {
-    private displayHints = true;
-
-    public async toggleHintsDisplay(displayHints: boolean): Promise<void> {
-        if (this.displayHints !== displayHints) {
-            this.displayHints = displayHints;
-            return this.refreshVisibleEditorsHints(
-                displayHints ? undefined : [],
-            );
-        }
-    }
-
-    public async refreshHintsForVisibleEditors(
-        cause?: TextDocumentChangeEvent,
-    ): Promise<void> {
-        if (!this.displayHints) {
-            return;
-        }
-        if (
-            cause !== undefined &&
-            (cause.contentChanges.length === 0 ||
-                !this.isRustDocument(cause.document))
-        ) {
-            return;
-        }
-        return this.refreshVisibleEditorsHints();
-    }
-
-    private async refreshVisibleEditorsHints(
-        newDecorations?: vscode.DecorationOptions[],
-    ) {
-        const promises: Array<Promise<void>> = [];
-
-        for (const rustEditor of vscode.window.visibleTextEditors.filter(
-            editor => this.isRustDocument(editor.document),
-        )) {
-            if (newDecorations !== undefined) {
-                promises.push(
-                    Promise.resolve(
-                        rustEditor.setDecorations(
-                            typeHintDecorationType,
-                            newDecorations,
-                        ),
-                    ),
-                );
-            } else {
-                promises.push(this.updateDecorationsFromServer(rustEditor));
-            }
-        }
-
-        for (const promise of promises) {
-            await promise;
-        }
-    }
-
-    private isRustDocument(document: vscode.TextDocument): boolean {
-        return document && document.languageId === 'rust';
-    }
-
-    private async updateDecorationsFromServer(
-        editor: TextEditor,
-    ): Promise<void> {
-        const newHints = await this.queryHints(editor.document.uri.toString());
-        if (newHints !== null) {
-            const newDecorations = newHints.map(hint => ({
-                range: hint.range,
-                renderOptions: {
-                    after: {
-                        contentText: `: ${hint.label}`,
-                    },
-                },
-            }));
-            return editor.setDecorations(
-                typeHintDecorationType,
-                newDecorations,
-            );
-        }
-    }
-
-    private async queryHints(documentUri: string): Promise<InlayHint[] | null> {
-        const request: InlayHintsParams = {
-            textDocument: { uri: documentUri },
-        };
-        const client = Server.client;
-        return client
-            .onReady()
-            .then(() =>
-                client.sendRequest<InlayHint[] | null>(
-                    'rust-analyzer/inlayHints',
-                    request,
-                ),
-            );
-    }
-}
diff --git a/editors/code/src/commands/line_buffer.ts b/editors/code/src/commands/line_buffer.ts
deleted file mode 100644
index fb5b9f7f2..000000000
--- a/editors/code/src/commands/line_buffer.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export class LineBuffer {
-    private outBuffer: string = '';
-
-    public processOutput(chunk: string, cb: (line: string) => void) {
-        this.outBuffer += chunk;
-        let eolIndex = this.outBuffer.indexOf('\n');
-        while (eolIndex >= 0) {
-            // line includes the EOL
-            const line = this.outBuffer.slice(0, eolIndex + 1);
-            cb(line);
-            this.outBuffer = this.outBuffer.slice(eolIndex + 1);
-
-            eolIndex = this.outBuffer.indexOf('\n');
-        }
-    }
-}
diff --git a/editors/code/src/commands/runnables.ts b/editors/code/src/commands/runnables.ts
index 7728541de..8cd86c21e 100644
--- a/editors/code/src/commands/runnables.ts
+++ b/editors/code/src/commands/runnables.ts
@@ -1,7 +1,67 @@
 import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
 
-import { Server } from '../server';
+import { Ctx, Cmd } from '../ctx';
+
+export function run(ctx: Ctx): Cmd {
+    let prevRunnable: RunnableQuickPick | undefined;
+
+    return async () => {
+        const editor = ctx.activeRustEditor;
+        if (!editor) return;
+
+        const textDocument: lc.TextDocumentIdentifier = {
+            uri: editor.document.uri.toString(),
+        };
+        const params: RunnablesParams = {
+            textDocument,
+            position: ctx.client.code2ProtocolConverter.asPosition(
+                editor.selection.active,
+            ),
+        };
+        const runnables = await ctx.client.sendRequest<Runnable[]>(
+            'rust-analyzer/runnables',
+            params,
+        );
+        const items: RunnableQuickPick[] = [];
+        if (prevRunnable) {
+            items.push(prevRunnable);
+        }
+        for (const r of runnables) {
+            if (
+                prevRunnable &&
+                JSON.stringify(prevRunnable.runnable) === JSON.stringify(r)
+            ) {
+                continue;
+            }
+            items.push(new RunnableQuickPick(r));
+        }
+        const item = await vscode.window.showQuickPick(items);
+        if (!item) return;
+
+        item.detail = 'rerun';
+        prevRunnable = item;
+        const task = createTask(item.runnable);
+        return await vscode.tasks.executeTask(task);
+    };
+}
+
+export function runSingle(ctx: Ctx): Cmd {
+    return async (runnable: Runnable) => {
+        const editor = ctx.activeRustEditor;
+        if (!editor) return;
+
+        const task = createTask(runnable);
+        task.group = vscode.TaskGroup.Build;
+        task.presentationOptions = {
+            reveal: vscode.TaskRevealKind.Always,
+            panel: vscode.TaskPanelKind.Dedicated,
+            clear: true,
+        };
+
+        return vscode.tasks.executeTask(task);
+    };
+}
 
 interface RunnablesParams {
     textDocument: lc.TextDocumentIdentifier;
@@ -67,63 +127,3 @@ function createTask(spec: Runnable): vscode.Task {
     t.presentationOptions.clear = true;
     return t;
 }
-
-let prevRunnable: RunnableQuickPick | undefined;
-export async function handle(): Promise<vscode.TaskExecution | undefined> {
-    const editor = vscode.window.activeTextEditor;
-    if (editor == null || editor.document.languageId !== 'rust') {
-        return;
-    }
-    const textDocument: lc.TextDocumentIdentifier = {
-        uri: editor.document.uri.toString(),
-    };
-    const params: RunnablesParams = {
-        textDocument,
-        position: Server.client.code2ProtocolConverter.asPosition(
-            editor.selection.active,
-        ),
-    };
-    const runnables = await Server.client.sendRequest<Runnable[]>(
-        'rust-analyzer/runnables',
-        params,
-    );
-    const items: RunnableQuickPick[] = [];
-    if (prevRunnable) {
-        items.push(prevRunnable);
-    }
-    for (const r of runnables) {
-        if (
-            prevRunnable &&
-            JSON.stringify(prevRunnable.runnable) === JSON.stringify(r)
-        ) {
-            continue;
-        }
-        items.push(new RunnableQuickPick(r));
-    }
-    const item = await vscode.window.showQuickPick(items);
-    if (!item) {
-        return;
-    }
-
-    item.detail = 'rerun';
-    prevRunnable = item;
-    const task = createTask(item.runnable);
-    return await vscode.tasks.executeTask(task);
-}
-
-export async function handleSingle(runnable: Runnable) {
-    const editor = vscode.window.activeTextEditor;
-    if (editor == null || editor.document.languageId !== 'rust') {
-        return;
-    }
-
-    const task = createTask(runnable);
-    task.group = vscode.TaskGroup.Build;
-    task.presentationOptions = {
-        reveal: vscode.TaskRevealKind.Always,
-        panel: vscode.TaskPanelKind.Dedicated,
-        clear: true,
-    };
-
-    return vscode.tasks.executeTask(task);
-}
diff --git a/editors/code/src/commands/watch_status.ts b/editors/code/src/commands/watch_status.ts
deleted file mode 100644
index 10787b510..000000000
--- a/editors/code/src/commands/watch_status.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import * as vscode from 'vscode';
-
-const spinnerFrames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-
-export class StatusDisplay implements vscode.Disposable {
-    public packageName?: string;
-
-    private i = 0;
-    private statusBarItem: vscode.StatusBarItem;
-    private command: string;
-    private timer?: NodeJS.Timeout;
-
-    constructor(command: string) {
-        this.statusBarItem = vscode.window.createStatusBarItem(
-            vscode.StatusBarAlignment.Left,
-            10,
-        );
-        this.command = command;
-        this.statusBarItem.hide();
-    }
-
-    public show() {
-        this.packageName = undefined;
-
-        this.timer =
-            this.timer ||
-            setInterval(() => {
-                if (this.packageName) {
-                    this.statusBarItem!.text = `cargo ${this.command} [${
-                        this.packageName
-                    }] ${this.frame()}`;
-                } else {
-                    this.statusBarItem!.text = `cargo ${
-                        this.command
-                    } ${this.frame()}`;
-                }
-            }, 300);
-
-        this.statusBarItem.show();
-    }
-
-    public hide() {
-        if (this.timer) {
-            clearInterval(this.timer);
-            this.timer = undefined;
-        }
-
-        this.statusBarItem.hide();
-    }
-
-    public dispose() {
-        if (this.timer) {
-            clearInterval(this.timer);
-            this.timer = undefined;
-        }
-
-        this.statusBarItem.dispose();
-    }
-
-    public handleProgressNotification(params: ProgressParams) {
-        const { token, value } = params;
-        if (token !== 'rustAnalyzer/cargoWatcher') {
-            return;
-        }
-
-        switch (value.kind) {
-            case 'begin':
-                this.show();
-                break;
-
-            case 'report':
-                if (value.message) {
-                    this.packageName = value.message;
-                }
-                break;
-
-            case 'end':
-                this.hide();
-                break;
-        }
-    }
-
-    private frame() {
-        return spinnerFrames[(this.i = ++this.i % spinnerFrames.length)];
-    }
-}
-
-// FIXME: Replace this once vscode-languageclient is updated to LSP 3.15
-interface ProgressParams {
-    token: string;
-    value: WorkDoneProgress;
-}
-
-enum WorkDoneProgressKind {
-    Begin = 'begin',
-    Report = 'report',
-    End = 'end',
-}
-
-interface WorkDoneProgress {
-    kind: WorkDoneProgressKind;
-    message?: string;
-    cancelable?: boolean;
-    percentage?: string;
-}