1 files changed, 27 insertions, 7 deletions

diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index 014e96f75..4fbbe3ddc 100644
--- a/editors/code/src/highlighting.ts
+++ b/editors/code/src/highlighting.ts
@@ -1,7 +1,5 @@
 import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
-import * as seedrandom_ from 'seedrandom';
-const seedrandom = seedrandom_; // https://github.com/jvandemo/generator-angular2-library/issues/221#issuecomment-355945207
 
 import { ColorTheme, TextMateRuleSettings } from './color_theme';
 
@@ -34,6 +32,7 @@ export function activateHighlighting(ctx: Ctx) {
 
     vscode.workspace.onDidChangeConfiguration(
         _ => highlighter.removeHighlights(),
+        null,
         ctx.subscriptions,
     );
 
@@ -41,7 +40,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 = {
@@ -54,6 +53,7 @@ export function activateHighlighting(ctx: Ctx) {
             );
             highlighter.setHighlights(editor, decorations);
         },
+        null,
         ctx.subscriptions,
     );
 }
@@ -71,9 +71,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);
@@ -107,7 +107,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
         //
@@ -176,7 +176,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);
     });
@@ -247,3 +247,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;
+}