8 files changed, 102 insertions, 121 deletions

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 4096255ac..353af06bf 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -25,56 +25,49 @@
             }
         },
         "@rollup/plugin-commonjs": {
-            "version": "11.0.1",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.1.tgz",
-            "integrity": "sha512-SaVUoaLDg3KnIXC5IBNIspr1APTYDzk05VaYcI6qz+0XX3ZlSCwAkfAhNSOxfd5GAdcm/63Noi4TowOY9MpcDg==",
+            "version": "11.0.2",
+            "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.2.tgz",
+            "integrity": "sha512-MPYGZr0qdbV5zZj8/2AuomVpnRVXRU5XKXb3HVniwRoRCreGlf5kOE081isNWeiLIi6IYkwTX9zE0/c7V8g81g==",
             "dev": true,
             "requires": {
                 "@rollup/pluginutils": "^3.0.0",
-                "estree-walker": "^0.6.1",
+                "estree-walker": "^1.0.1",
                 "is-reference": "^1.1.2",
                 "magic-string": "^0.25.2",
                 "resolve": "^1.11.0"
             }
         },
         "@rollup/plugin-node-resolve": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-6.1.0.tgz",
-            "integrity": "sha512-Cv7PDIvxdE40SWilY5WgZpqfIUEaDxFxs89zCAHjqyRwlTSuql4M5hjIuc5QYJkOH0/vyiyNXKD72O+LhRipGA==",
+            "version": "7.1.1",
+            "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.1.tgz",
+            "integrity": "sha512-14ddhD7TnemeHE97a4rLOhobfYvUVcaYuqTnL8Ti7Jxi9V9Jr5LY7Gko4HZ5k4h4vqQM0gBQt6tsp9xXW94WPA==",
             "dev": true,
             "requires": {
-                "@rollup/pluginutils": "^3.0.0",
+                "@rollup/pluginutils": "^3.0.6",
                 "@types/resolve": "0.0.8",
                 "builtin-modules": "^3.1.0",
                 "is-module": "^1.0.0",
-                "resolve": "^1.11.1"
-            }
-        },
-        "@rollup/plugin-typescript": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-3.0.0.tgz",
-            "integrity": "sha512-O6915Ril3+Q0B4P898PULAcPFZfPuatEB/4nox7bnK48ekGrmamMYhMB5tOqWjihEWrw4oz/NL+c+/kS3Fk95g==",
-            "dev": true,
-            "requires": {
-                "@rollup/pluginutils": "^3.0.1",
-                "resolve": "^1.14.1"
+                "resolve": "^1.14.2"
+            },
+            "dependencies": {
+                "resolve": {
+                    "version": "1.15.0",
+                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
+                    "integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
+                    "dev": true,
+                    "requires": {
+                        "path-parse": "^1.0.6"
+                    }
+                }
             }
         },
         "@rollup/pluginutils": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.6.tgz",
-            "integrity": "sha512-Nb6U7sg11v8D+E4mxRxwT+UumUL7MSnwI8V1SJB3THyW2MOGD/Q6GyxLtpnjrbT3zTRPSozzDMyVZwemgldO3w==",
+            "version": "3.0.8",
+            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.8.tgz",
+            "integrity": "sha512-rYGeAc4sxcZ+kPG/Tw4/fwJODC3IXHYDH4qusdN/b6aLw5LPUbzpecYbEJh4sVQGPFJxd2dBU4kc1H3oy9/bnw==",
             "dev": true,
             "requires": {
                 "estree-walker": "^1.0.1"
-            },
-            "dependencies": {
-                "estree-walker": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-                    "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-                    "dev": true
-                }
             }
         },
         "@types/estree": {
@@ -98,12 +91,6 @@
                 "@types/node": "*"
             }
         },
-        "@types/seedrandom": {
-            "version": "2.4.28",
-            "resolved": "https://registry.npmjs.org/@types/seedrandom/-/seedrandom-2.4.28.tgz",
-            "integrity": "sha512-SMA+fUwULwK7sd/ZJicUztiPs8F1yCPwF3O23Z9uQ32ME5Ha0NmDK9+QTsYE4O2tHXChzXomSWWeIhCnoN1LqA==",
-            "dev": true
-        },
         "@types/vscode": {
             "version": "1.41.0",
             "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.41.0.tgz",
@@ -348,9 +335,9 @@
             "dev": true
         },
         "estree-walker": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
-            "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+            "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
             "dev": true
         },
         "esutils": {
@@ -675,9 +662,9 @@
             }
         },
         "rollup": {
-            "version": "1.30.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.30.1.tgz",
-            "integrity": "sha512-Uus8mwQXwaO+ZVoNwBcXKhT0AvycFCBW/W8VZtkpVGsotRllWk9oldfCjqWmTnFRI0y7x6BnEqSqc65N+/YdBw==",
+            "version": "1.31.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.31.0.tgz",
+            "integrity": "sha512-9C6ovSyNeEwvuRuUUmsTpJcXac1AwSL1a3x+O5lpmQKZqi5mmrjauLeqIjvREC+yNRR8fPdzByojDng+af3nVw==",
             "dev": true,
             "requires": {
                 "@types/estree": "*",
@@ -691,11 +678,6 @@
             "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
             "dev": true
         },
-        "seedrandom": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
-            "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
-        },
         "semver": {
             "version": "6.3.0",
             "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -749,7 +731,8 @@
         "tslib": {
             "version": "1.10.0",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-            "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+            "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+            "dev": true
         },
         "tslint": {
             "version": "5.20.1",
@@ -895,7 +878,7 @@
         "vscode-languageclient": {
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.0.tgz",
-            "integrity": "sha1-7mfAt4GMQs4CgVctBcia38xPWjg=",
+            "integrity": "sha512-Tcp0VoOaa0YzxL4nEfK9tsmcy76Eo8jNLvFQZwh2c8oMm02luL8uGYPLQNAiZ3XGgegfcwiQFZMqbW7DNV0vxA==",
             "requires": {
                 "semver": "^6.3.0",
                 "vscode-languageserver-protocol": "^3.15.2"
diff --git a/editors/code/package.json b/editors/code/package.json
index e733ee2b4..c9404a4dd 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -18,28 +18,25 @@
         "vscode": "^1.41.0"
     },
     "scripts": {
-        "vscode:prepublish": "rollup -c",
+        "vscode:prepublish": "tsc && rollup -c",
         "package": "vsce package",
-        "watch": "tsc -watch -p ./",
+        "watch": "tsc --watch",
         "fmt": "tsfmt -r && tslint -c tslint.json 'src/**/*.ts' --fix"
     },
     "dependencies": {
         "jsonc-parser": "^2.1.0",
-        "seedrandom": "^3.0.5",
-        "vscode-languageclient": "^6.1.0",
-        "tslib": "^1.10.0"
+        "vscode-languageclient": "^6.1.0"
     },
     "devDependencies": {
-        "@rollup/plugin-commonjs": "^11.0.1",
-        "@rollup/plugin-node-resolve": "^6.1.0",
-        "@rollup/plugin-typescript": "^3.0.0",
+        "@rollup/plugin-commonjs": "^11.0.2",
+        "@rollup/plugin-node-resolve": "^7.1.1",
         "@types/node": "^12.12.25",
-        "@types/seedrandom": "^2.4.28",
         "@types/vscode": "^1.41.0",
-        "rollup": "^1.30.1",
+        "rollup": "^1.31.0",
+        "tslib": "^1.10.0",
         "tslint": "^5.20.1",
-        "typescript": "^3.7.5",
         "typescript-formatter": "^7.2.2",
+        "typescript": "^3.7.5",
         "vsce": "^1.71.0"
     },
     "activationEvents": [
@@ -117,6 +114,11 @@
                 "command": "rust-analyzer.reload",
                 "title": "Restart server",
                 "category": "Rust Analyzer"
+            },
+            {
+                "command": "rust-analyzer.onEnter",
+                "title": "Enhanced enter key",
+                "category": "Rust Analyzer"
             }
         ],
         "keybindings": [
@@ -139,6 +141,11 @@
                 "command": "rust-analyzer.run",
                 "key": "ctrl+r",
                 "when": "editorTextFocus && editorLangId == rust"
+            },
+            {
+                "command": "rust-analyzer.onEnter",
+                "key": "enter",
+                "when": "editorTextFocus && !suggestWidgetVisible && editorLangId == rust"
             }
         ],
         "configuration": {
@@ -160,11 +167,6 @@
                     "default": {},
                     "description": "Fine grained feature flags to disable annoying features"
                 },
-                "rust-analyzer.enableEnhancedTyping": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "Enables enhanced typing. NOTE: If using a VIM extension, you should set this to false"
-                },
                 "rust-analyzer.raLspServerPath": {
                     "type": [
                         "string"
diff --git a/editors/code/rollup.config.js b/editors/code/rollup.config.js
index de6a3b2b7..f8d320f46 100644
--- a/editors/code/rollup.config.js
+++ b/editors/code/rollup.config.js
@@ -1,12 +1,10 @@
-import typescript from '@rollup/plugin-typescript';
 import resolve from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import nodeBuiltins from 'builtin-modules';
 
 export default {
-    input: 'src/main.ts',
+    input: 'out/main.js',
     plugins: [
-        typescript(),
         resolve({
             preferBuiltins: true
         }),
diff --git a/editors/code/src/commands/on_enter.ts b/editors/code/src/commands/on_enter.ts
index 6f61883cd..c636234da 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) return false;
+    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/ctx.ts b/editors/code/src/ctx.ts
index 05d21ae56..aa75943bf 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -50,30 +50,6 @@ export class Ctx {
         this.pushCleanup(d);
     }
 
-    overrideCommand(name: string, factory: (ctx: Ctx) => Cmd) {
-        const defaultCmd = `default:${name}`;
-        const override = factory(this);
-        const original = (...args: unknown[]) =>
-            vscode.commands.executeCommand(defaultCmd, ...args);
-        try {
-            const d = vscode.commands.registerCommand(
-                name,
-                async (...args: unknown[]) => {
-                    if (!(await override(...args))) {
-                        return await original(...args);
-                    }
-                },
-            );
-            this.pushCleanup(d);
-        } catch (_) {
-            vscode.window.showWarningMessage(
-                'Enhanced typing feature is disabled because of incompatibility ' +
-                'with VIM extension, consider turning off rust-analyzer.enableEnhancedTyping: ' +
-                'https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/README.md#settings',
-            );
-        }
-    }
-
     get subscriptions(): Disposable[] {
         return this.extCtx.subscriptions;
     }
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index 3d190c3ad..66216e0fc 100644
--- a/editors/code/src/highlighting.ts
+++ b/editors/code/src/highlighting.ts
@@ -1,6 +1,5 @@
 import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
-import seedrandom from 'seedrandom';
 
 import { ColorTheme, TextMateRuleSettings } from './color_theme';
 
@@ -70,9 +69,9 @@ interface Decoration {
 
 // Based on this HSL-based color generator: https://gist.github.com/bendc/76c48ce53299e6078a76
 function fancify(seed: string, shade: 'light' | 'dark') {
-    const random = seedrandom(seed);
+    const random = randomU32Numbers(hashString(seed))
     const randomInt = (min: number, max: number) => {
-        return Math.floor(random() * (max - min + 1)) + min;
+        return Math.abs(random()) % (max - min + 1) + min;
     };
 
     const h = randomInt(0, 360);
@@ -246,3 +245,23 @@ const TAG_TO_SCOPES = new Map<string, string[]>([
     ["keyword.unsafe", ["keyword.other.unsafe"]],
     ["keyword.control", ["keyword.control"]],
 ]);
+
+function randomU32Numbers(seed: number) {
+    let random = seed | 0;
+    return () => {
+        random ^= random << 13;
+        random ^= random >> 17;
+        random ^= random << 5;
+        random |= 0;
+        return random
+    }
+}
+
+function hashString(str: string): number {
+    let res = 0;
+    for (let i = 0; i < str.length; ++i) {
+        const c = str.codePointAt(i)!!;
+        res = (res * 31 + c) & ~0;
+    }
+    return res;
+}
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 6813c3c4c..efc31b2e2 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -21,6 +21,7 @@ export async function activate(context: vscode.ExtensionContext) {
     ctx.registerCommand('expandMacro', commands.expandMacro);
     ctx.registerCommand('run', commands.run);
     ctx.registerCommand('reload', commands.reload);
+    ctx.registerCommand('onEnter', commands.onEnter);
 
     // Internal commands which are invoked by the server.
     ctx.registerCommand('runSingle', commands.runSingle);
@@ -28,9 +29,6 @@ export async function activate(context: vscode.ExtensionContext) {
     ctx.registerCommand('applySourceChange', commands.applySourceChange);
     ctx.registerCommand('selectAndApplySourceChange', commands.selectAndApplySourceChange);
 
-    if (ctx.config.enableEnhancedTyping) {
-        ctx.overrideCommand('type', commands.onEnter);
-    }
     activateStatusDisplay(ctx);
 
     activateHighlighting(ctx);
diff --git a/editors/code/tsconfig.json b/editors/code/tsconfig.json
index 1740abb2e..e60eb8e5e 100644
--- a/editors/code/tsconfig.json
+++ b/editors/code/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "module": "es2015",
+        "module": "commonjs",
         "target": "es2018",
         "outDir": "out",
         "lib": [
@@ -13,9 +13,7 @@
         "noUnusedParameters": true,
         "noImplicitReturns": true,
         "noFallthroughCasesInSwitch": true,
-        "newLine": "LF",
-        "esModuleInterop": true,
-        "importHelpers": true
+        "newLine": "LF"
     },
     "exclude": [
         "node_modules"