1 files changed, 53 insertions, 13 deletions

diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts
index 13a696758..9a1697dcb 100644
--- a/editors/code/src/commands/index.ts
+++ b/editors/code/src/commands/index.ts
@@ -1,23 +1,63 @@
-import * as analyzerStatus from './analyzer_status';
-import * as applySourceChange from './apply_source_change';
-import * as expandMacro from './expand_macro';
-import * as inlayHints from './inlay_hints';
-import * as joinLines from './join_lines';
-import * as matchingBrace from './matching_brace';
-import * as onEnter from './on_enter';
-import * as parentModule from './parent_module';
-import * as runnables from './runnables';
-import * as syntaxTree from './syntaxTree';
+import * as vscode from 'vscode';
+import * as lc from 'vscode-languageclient';
+
+import { Ctx, Cmd } from '../ctx';
+import * as sourceChange from '../source_change';
+
+import { analyzerStatus } from './analyzer_status';
+import { matchingBrace } from './matching_brace';
+import { joinLines } from './join_lines';
+import { onEnter } from './on_enter';
+import { parentModule } from './parent_module';
+import { syntaxTree } from './syntax_tree';
+import { expandMacro } from './expand_macro';
+import { run, runSingle } from './runnables';
+
+function collectGarbage(ctx: Ctx): Cmd {
+    return async () => {
+        ctx.client?.sendRequest<null>('rust-analyzer/collectGarbage', null);
+    };
+}
+
+function showReferences(ctx: Ctx): Cmd {
+    return (uri: string, position: lc.Position, locations: lc.Location[]) => {
+        let client = ctx.client;
+        if (client) {
+            vscode.commands.executeCommand(
+                'editor.action.showReferences',
+                vscode.Uri.parse(uri),
+                client.protocol2CodeConverter.asPosition(position),
+                locations.map(client.protocol2CodeConverter.asLocation),
+            );
+        }
+    };
+}
+
+function applySourceChange(ctx: Ctx): Cmd {
+    return async (change: sourceChange.SourceChange) => {
+        sourceChange.applySourceChange(ctx, change);
+    };
+}
+
+function reload(ctx: Ctx): Cmd {
+    return async () => {
+        vscode.window.showInformationMessage('Reloading rust-analyzer...');
+        await ctx.restartServer();
+    };
+}
 
 export {
     analyzerStatus,
-    applySourceChange,
     expandMacro,
     joinLines,
     matchingBrace,
     parentModule,
-    runnables,
     syntaxTree,
     onEnter,
-    inlayHints,
+    collectGarbage,
+    run,
+    runSingle,
+    showReferences,
+    applySourceChange,
+    reload
 };