3 files changed, 45 insertions, 53 deletions

diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts
index dc075aa82..aee969432 100644
--- a/editors/code/src/commands/index.ts
+++ b/editors/code/src/commands/index.ts
@@ -4,24 +4,24 @@ 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 {
+export * from './analyzer_status';
+export * from './matching_brace';
+export * from './join_lines';
+export * from './on_enter';
+export * from './parent_module';
+export * from './syntax_tree';
+export * from './expand_macro';
+export * from './runnables';
+
+export function collectGarbage(ctx: Ctx): Cmd {
     return async () => {
         ctx.client?.sendRequest<null>('rust-analyzer/collectGarbage', null);
     };
 }
 
-function showReferences(ctx: Ctx): Cmd {
+export function showReferences(ctx: Ctx): Cmd {
     return (uri: string, position: lc.Position, locations: lc.Location[]) => {
-        let client = ctx.client;
+        const client = ctx.client;
         if (client) {
             vscode.commands.executeCommand(
                 'editor.action.showReferences',
@@ -33,13 +33,13 @@ function showReferences(ctx: Ctx): Cmd {
     };
 }
 
-function applySourceChange(ctx: Ctx): Cmd {
+export function applySourceChange(ctx: Ctx): Cmd {
     return async (change: sourceChange.SourceChange) => {
-        sourceChange.applySourceChange(ctx, change);
+        await sourceChange.applySourceChange(ctx, change);
     };
 }
 
-function selectAndApplySourceChange(ctx: Ctx): Cmd {
+export function selectAndApplySourceChange(ctx: Ctx): Cmd {
     return async (changes: sourceChange.SourceChange[]) => {
         if (changes.length === 1) {
             await sourceChange.applySourceChange(ctx, changes[0]);
@@ -51,26 +51,9 @@ function selectAndApplySourceChange(ctx: Ctx): Cmd {
     };
 }
 
-function reload(ctx: Ctx): Cmd {
+export function reload(ctx: Ctx): Cmd {
     return async () => {
         vscode.window.showInformationMessage('Reloading rust-analyzer...');
         await ctx.restartServer();
     };
 }
-
-export {
-    analyzerStatus,
-    expandMacro,
-    joinLines,
-    matchingBrace,
-    parentModule,
-    syntaxTree,
-    onEnter,
-    collectGarbage,
-    run,
-    runSingle,
-    showReferences,
-    applySourceChange,
-    selectAndApplySourceChange,
-    reload
-};
diff --git a/editors/code/src/commands/on_enter.ts b/editors/code/src/commands/on_enter.ts
index 6f61883cd..25eaebcbe 100644
--- a/editors/code/src/commands/on_enter.ts
+++ b/editors/code/src/commands/on_enter.ts
@@ -1,28 +1,35 @@
+import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
 
 import { applySourceChange, SourceChange } from '../source_change';
 import { Cmd, Ctx } from '../ctx';
 
-export function onEnter(ctx: Ctx): Cmd {
-    return async (event: { text: string }) => {
-        const editor = ctx.activeRustEditor;
-        const client = ctx.client;
-        if (!editor || event.text !== '\n') return false;
-        if (!client) return false;
+async function handleKeypress(ctx: Ctx) {
+    const editor = ctx.activeRustEditor;
+    const client = ctx.client;
+
+    if (!editor || !client) return false;
+
+    const request: lc.TextDocumentPositionParams = {
+        textDocument: { uri: editor.document.uri.toString() },
+        position: client.code2ProtocolConverter.asPosition(
+            editor.selection.active,
+        ),
+    };
+    const change = await client.sendRequest<undefined | SourceChange>(
+        'rust-analyzer/onEnter',
+        request,
+    );
+    if (!change) return false;
 
-        const request: lc.TextDocumentPositionParams = {
-            textDocument: { uri: editor.document.uri.toString() },
-            position: client.code2ProtocolConverter.asPosition(
-                editor.selection.active,
-            ),
-        };
-        const change = await client.sendRequest<undefined | SourceChange>(
-            'rust-analyzer/onEnter',
-            request,
-        );
-        if (!change) return false;
+    await applySourceChange(ctx, change);
+    return true;
+}
+
+export function onEnter(ctx: Ctx): Cmd {
+    return async () => {
+        if (await handleKeypress(ctx)) return;
 
-        await applySourceChange(ctx, change);
-        return true;
+        await vscode.commands.executeCommand('default:type', { text: '\n' });
     };
 }
diff --git a/editors/code/src/commands/syntax_tree.ts b/editors/code/src/commands/syntax_tree.ts
index 02ea9f166..7dde66ad1 100644
--- a/editors/code/src/commands/syntax_tree.ts
+++ b/editors/code/src/commands/syntax_tree.ts
@@ -22,6 +22,7 @@ export function syntaxTree(ctx: Ctx): Cmd {
             if (doc.languageId !== 'rust') return;
             afterLs(() => tdcp.eventEmitter.fire(tdcp.uri));
         },
+        null,
         ctx.subscriptions,
     );
 
@@ -30,6 +31,7 @@ export function syntaxTree(ctx: Ctx): Cmd {
             if (!editor || editor.document.languageId !== 'rust') return;
             tdcp.eventEmitter.fire(tdcp.uri);
         },
+        null,
         ctx.subscriptions,
     );
 
@@ -55,7 +57,7 @@ export function syntaxTree(ctx: Ctx): Cmd {
 
 // We need to order this after LS updates, but there's no API for that.
 // Hence, good old setTimeout.
-function afterLs(f: () => any) {
+function afterLs(f: () => void) {
     setTimeout(f, 10);
 }