14 files changed, 106 insertions, 120 deletions

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index f92ce1fe2..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": "2.1.0",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-2.1.0.tgz",
-            "integrity": "sha512-7lXKGY06aofrceVez/YnN2axttFdHSqlUBpCJ6ebzDfxwLDKMgSV5lD4ykBcdgE7aK3egxuLkD/HKyRB5L8Log==",
-            "dev": true,
-            "requires": {
-                "@rollup/pluginutils": "^3.0.0",
-                "resolve": "^1.13.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",
@@ -896,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 55d470fa0..c0d8f0183 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -8,7 +8,8 @@
     "version": "0.1.0",
     "publisher": "matklad",
     "repository": {
-        "url": "https://github.com/matklad/rust-analyzer/"
+        "url": "https://github.com/rust-analyzer/rust-analyzer.git",
+        "type": "git"
     },
     "categories": [
         "Other"
@@ -17,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"
     },
     "devDependencies": {
-        "@rollup/plugin-commonjs": "^11.0.1",
-        "@rollup/plugin-node-resolve": "^6.1.0",
-        "@rollup/plugin-typescript": "^2.1.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": [
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/client.ts b/editors/code/src/client.ts
index 15e1a0873..1778c4e9f 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -68,7 +68,7 @@ PATH=${process.env.PATH}
     // This also requires considering our settings strategy, which is work which needs doing
     // @ts-ignore The tracer is private to vscode-languageclient, but we need access to it to not log publishDecorations requests
     res._tracer = {
-        log: (messageOrDataObject: string | any, data?: string) => {
+        log: (messageOrDataObject: string | unknown, data?: string) => {
             if (typeof messageOrDataObject === 'string') {
                 if (
                     messageOrDataObject.includes(
diff --git a/editors/code/src/color_theme.ts b/editors/code/src/color_theme.ts
index d816f617d..7e10c7f79 100644
--- a/editors/code/src/color_theme.ts
+++ b/editors/code/src/color_theme.ts
@@ -61,7 +61,7 @@ export class ColorTheme {
 }
 
 function loadThemeNamed(themeName: string): ColorTheme {
-    function isTheme(extension: vscode.Extension<any>): boolean {
+    function isTheme(extension: vscode.Extension<unknown>): boolean {
         return (
             extension.extensionKind === vscode.ExtensionKind.UI &&
             extension.packageJSON.contributes &&
@@ -69,7 +69,7 @@ function loadThemeNamed(themeName: string): ColorTheme {
         );
     }
 
-    let themePaths = vscode.extensions.all
+    const themePaths = vscode.extensions.all
         .filter(isTheme)
         .flatMap(ext => {
             return ext.packageJSON.contributes.themes
diff --git a/editors/code/src/commands/index.ts b/editors/code/src/commands/index.ts
index dc075aa82..5a4c1df5e 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);
     };
 }
 
-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/syntax_tree.ts b/editors/code/src/commands/syntax_tree.ts
index 02ea9f166..211f2251f 100644
--- a/editors/code/src/commands/syntax_tree.ts
+++ b/editors/code/src/commands/syntax_tree.ts
@@ -55,7 +55,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);
 }
 
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index a2a4e42a9..05d21ae56 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -1,5 +1,6 @@
 import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
+
 import { Config } from './config';
 import { createClient } from './client';
 
@@ -20,7 +21,7 @@ export class Ctx {
     }
 
     async restartServer() {
-        let old = this.client;
+        const old = this.client;
         if (old) {
             await old.stop();
         }
@@ -52,12 +53,12 @@ export class Ctx {
     overrideCommand(name: string, factory: (ctx: Ctx) => Cmd) {
         const defaultCmd = `default:${name}`;
         const override = factory(this);
-        const original = (...args: any[]) =>
+        const original = (...args: unknown[]) =>
             vscode.commands.executeCommand(defaultCmd, ...args);
         try {
             const d = vscode.commands.registerCommand(
                 name,
-                async (...args: any[]) => {
+                async (...args: unknown[]) => {
                     if (!(await override(...args))) {
                         return await original(...args);
                     }
@@ -66,16 +67,18 @@ export class Ctx {
             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',
+                '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(): { dispose(): any }[] {
+    get subscriptions(): Disposable[] {
         return this.extCtx.subscriptions;
     }
 
-    pushCleanup(d: { dispose(): any }) {
+    pushCleanup(d: Disposable) {
         this.extCtx.subscriptions.push(d);
     }
 
@@ -84,12 +87,15 @@ export class Ctx {
     }
 }
 
-export type Cmd = (...args: any[]) => any;
+export interface Disposable {
+    dispose(): void;
+}
+export type Cmd = (...args: any[]) => unknown;
 
 export async function sendRequestWithRetry<R>(
     client: lc.LanguageClient,
     method: string,
-    param: any,
+    param: unknown,
     token?: vscode.CancellationToken,
 ): Promise<R> {
     for (const delay of [2, 4, 6, 8, 10, null]) {
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index fc7cd5a1c..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';
 
@@ -40,7 +39,7 @@ export function activateHighlighting(ctx: Ctx) {
         async (editor: vscode.TextEditor | undefined) => {
             if (!editor || editor.document.languageId !== 'rust') return;
             if (!ctx.config.highlightingOn) return;
-            let client = ctx.client;
+            const client = ctx.client;
             if (!client) return;
 
             const params: lc.TextDocumentIdentifier = {
@@ -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);
@@ -106,7 +105,7 @@ class Highlighter {
     }
 
     public setHighlights(editor: vscode.TextEditor, highlights: Decoration[]) {
-        let client = this.ctx.client;
+        const client = this.ctx.client;
         if (!client) return;
         // Initialize decorations if necessary
         //
@@ -175,7 +174,7 @@ function initDecorations(): Map<string, vscode.TextEditorDecorationType> {
     const res = new Map();
     TAG_TO_SCOPES.forEach((scopes, tag) => {
         if (!scopes) throw `unmapped tag: ${tag}`;
-        let rule = theme.lookup(scopes);
+        const rule = theme.lookup(scopes);
         const decor = createDecorationFromTextmate(rule);
         res.set(tag, decor);
     });
@@ -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/inlay_hints.ts b/editors/code/src/inlay_hints.ts
index 6357e44f1..ae7510183 100644
--- a/editors/code/src/inlay_hints.ts
+++ b/editors/code/src/inlay_hints.ts
@@ -127,13 +127,13 @@ class HintsUpdater {
     }
 
     private async queryHints(documentUri: string): Promise<InlayHint[] | null> {
-        let client = this.ctx.client;
+        const client = this.ctx.client;
         if (!client) return null;
         const request: InlayHintsParams = {
             textDocument: { uri: documentUri },
         };
-        let tokenSource = new vscode.CancellationTokenSource();
-        let prev = this.pending.get(documentUri);
+        const tokenSource = new vscode.CancellationTokenSource();
+        const prev = this.pending.get(documentUri);
         if (prev) prev.cancel();
         this.pending.set(documentUri, tokenSource);
         try {
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 0494ccf63..6813c3c4c 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -11,7 +11,7 @@ let ctx!: Ctx;
 export async function activate(context: vscode.ExtensionContext) {
     ctx = new Ctx(context);
 
-    // Commands which invokes manually via command pallet, shortcut, etc.
+    // Commands which invokes manually via command palette, shortcut, etc.
     ctx.registerCommand('analyzerStatus', commands.analyzerStatus);
     ctx.registerCommand('collectGarbage', commands.collectGarbage);
     ctx.registerCommand('matchingBrace', commands.matchingBrace);
diff --git a/editors/code/src/status_display.ts b/editors/code/src/status_display.ts
index 7345bc3f5..4317410c7 100644
--- a/editors/code/src/status_display.ts
+++ b/editors/code/src/status_display.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 
-import { WorkDoneProgress, WorkDoneProgressBegin, WorkDoneProgressReport, WorkDoneProgressEnd } from 'vscode-languageclient';
+import { WorkDoneProgress, WorkDoneProgressBegin, WorkDoneProgressReport, WorkDoneProgressEnd, Disposable } from 'vscode-languageclient';
 
 import { Ctx } from './ctx';
 
@@ -14,7 +14,7 @@ export function activateStatusDisplay(ctx: Ctx) {
     });
 }
 
-class StatusDisplay implements vscode.Disposable {
+class StatusDisplay implements vscode.Disposable, Disposable {
     packageName?: string;
 
     private i: number = 0;
diff --git a/editors/code/tsconfig.json b/editors/code/tsconfig.json
index 1ea433961..e60eb8e5e 100644
--- a/editors/code/tsconfig.json
+++ b/editors/code/tsconfig.json
@@ -13,8 +13,7 @@
         "noUnusedParameters": true,
         "noImplicitReturns": true,
         "noFallthroughCasesInSwitch": true,
-        "newLine": "LF",
-        "esModuleInterop": true,
+        "newLine": "LF"
     },
     "exclude": [
         "node_modules"
diff --git a/editors/code/tslint.json b/editors/code/tslint.json
index 318e02b4b..0df11b2f1 100644
--- a/editors/code/tslint.json
+++ b/editors/code/tslint.json
@@ -3,6 +3,7 @@
         "semicolon": [
             true,
             "always"
-        ]
+        ],
+        "prefer-const": true
     }
 }