6 files changed, 268 insertions, 34 deletions

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index e6bcbfa60..9c55c257f 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -598,9 +598,9 @@
             }
         },
         "https-proxy-agent": {
-            "version": "2.2.2",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz",
-            "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==",
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.3.tgz",
+            "integrity": "sha512-Ytgnz23gm2DVftnzqRRz2dOXZbGd2uiajSw/95bPp6v53zPRspQjLm/AfBgqbJ2qfeRXWIOMVLpp86+/5yX39Q==",
             "dev": true,
             "requires": {
                 "agent-base": "^4.3.0",
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 95c3f42e5..12823f319 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -1,5 +1,6 @@
 import * as vscode from 'vscode';
-
+import * as scopes from './scopes';
+import * as scopesMapper from './scopes_mapper';
 import { Server } from './server';
 
 const RA_LSP_DEBUG = process.env.__RA_LSP_SERVER_DEBUG;
@@ -45,7 +46,12 @@ export class Config {
 
     public userConfigChanged() {
         const config = vscode.workspace.getConfiguration('rust-analyzer');
+        
+        Server.highlighter.removeHighlights();
+        scopes.load()
+        scopesMapper.load()
         if (config.has('highlightingOn')) {
+
             this.highlightingOn = config.get('highlightingOn') as boolean;
         }
 
diff --git a/editors/code/src/extension.ts b/editors/code/src/extension.ts
index c06928d12..07a5c59e8 100644
--- a/editors/code/src/extension.ts
+++ b/editors/code/src/extension.ts
@@ -91,11 +91,11 @@ export function activate(context: vscode.ExtensionContext) {
     const allNotifications: Iterable<
         [string, lc.GenericNotificationHandler]
     > = [
-        [
-            'rust-analyzer/publishDecorations',
-            notifications.publishDecorations.handle
-        ]
-    ];
+            [
+                'rust-analyzer/publishDecorations',
+                notifications.publishDecorations.handle
+            ]
+        ];
     const syntaxTreeContentProvider = new SyntaxTreeContentProvider();
 
     // The events below are plain old javascript events, triggered and handled by vscode
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index d21d8a06a..b7dffaff5 100644
--- a/editors/code/src/highlighting.ts
+++ b/editors/code/src/highlighting.ts
@@ -1,6 +1,8 @@
 import seedrandom = require('seedrandom');
 import * as vscode from 'vscode';
 import * as lc from 'vscode-languageclient';
+import * as scopes from './scopes'
+import * as scopesMapper from './scopes_mapper';
 
 import { Server } from './server';
 
@@ -23,6 +25,37 @@ function fancify(seed: string, shade: 'light' | 'dark') {
     return `hsl(${h},${s}%,${l}%)`;
 }
 
+function createDecorationFromTextmate(themeStyle: scopes.TextMateRuleSettings): vscode.TextEditorDecorationType {
+    const options: vscode.DecorationRenderOptions = {}
+    options.rangeBehavior = vscode.DecorationRangeBehavior.OpenOpen
+    if (themeStyle.foreground) {
+        options.color = themeStyle.foreground
+    }
+    if (themeStyle.background) {
+        options.backgroundColor = themeStyle.background
+    }
+    if (themeStyle.fontStyle) {
+        const parts: string[] = themeStyle.fontStyle.split(' ')
+        parts.forEach((part) => {
+            switch (part) {
+                case 'italic':
+                    options.fontStyle = 'italic'
+                    break
+                case 'bold':
+                    options.fontWeight = 'bold'
+
+                    break
+                case 'underline':
+                    options.textDecoration = 'underline'
+                    break
+                default:
+                    break
+            }
+        })
+    }
+    return vscode.window.createTextEditorDecorationType(options)
+}
+
 export class Highlighter {
     private static initDecorations(): Map<
         string,
@@ -32,36 +65,46 @@ export class Highlighter {
             tag: string,
             textDecoration?: string
         ): [string, vscode.TextEditorDecorationType] => {
-            const color = new vscode.ThemeColor('ralsp.' + tag);
-            const decor = vscode.window.createTextEditorDecorationType({
-                color,
-                textDecoration
-            });
-            return [tag, decor];
+
+            const rule = scopesMapper.toRule(tag, scopes.find)
+
+            if (rule) {
+                const decor = createDecorationFromTextmate(rule);
+                return [tag, decor];
+            }
+            else {
+                console.log('Missing theme for: ' + tag);
+                const color = new vscode.ThemeColor('ralsp.' + tag);
+                const decor = vscode.window.createTextEditorDecorationType({
+                    color,
+                    textDecoration
+                });
+                return [tag, decor];
+            }
         };
 
         const decorations: Iterable<
             [string, vscode.TextEditorDecorationType]
         > = [
-            decoration('comment'),
-            decoration('string'),
-            decoration('keyword'),
-            decoration('keyword.control'),
-            decoration('keyword.unsafe'),
-            decoration('function'),
-            decoration('parameter'),
-            decoration('constant'),
-            decoration('type'),
-            decoration('builtin'),
-            decoration('text'),
-            decoration('attribute'),
-            decoration('literal'),
-            decoration('macro'),
-            decoration('variable'),
-            decoration('variable.mut', 'underline'),
-            decoration('field'),
-            decoration('module')
-        ];
+                decoration('comment'),
+                decoration('string'),
+                decoration('keyword'),
+                decoration('keyword.control'),
+                decoration('keyword.unsafe'),
+                decoration('function'),
+                decoration('parameter'),
+                decoration('constant'),
+                decoration('type'),
+                decoration('builtin'),
+                decoration('text'),
+                decoration('attribute'),
+                decoration('literal'),
+                decoration('macro'),
+                decoration('variable'),
+                decoration('variable.mut', 'underline'),
+                decoration('field'),
+                decoration('module')
+            ];
 
         return new Map<string, vscode.TextEditorDecorationType>(decorations);
     }
@@ -89,6 +132,8 @@ export class Highlighter {
         //
         // Note: decoration objects need to be kept around so we can dispose them
         // if the user disables syntax highlighting
+
+
         if (this.decorations == null) {
             this.decorations = Highlighter.initDecorations();
         }
@@ -133,6 +178,7 @@ export class Highlighter {
                 tag
             ) as vscode.TextEditorDecorationType;
             const ranges = byTag.get(tag)!;
+
             editor.setDecorations(dec, ranges);
         }
 
diff --git a/editors/code/src/scopes.ts b/editors/code/src/scopes.ts
new file mode 100644
index 000000000..470ee716f
--- /dev/null
+++ b/editors/code/src/scopes.ts
@@ -0,0 +1,134 @@
+import * as fs from 'fs'
+import * as path from 'path'
+import * as vscode from 'vscode'
+
+
+
+export interface TextMateRule {
+    scope: string | string[]
+    settings: TextMateRuleSettings
+}
+
+export interface TextMateRuleSettings {
+    foreground: string | undefined
+    background: string | undefined
+    fontStyle: string | undefined
+}
+
+// Current theme colors
+const rules = new Map<string, TextMateRuleSettings>()
+
+export function find(scope: string): TextMateRuleSettings | undefined {
+    return rules.get(scope)
+}
+
+// Load all textmate scopes in the currently active theme
+export function load() {
+    // Remove any previous theme
+    rules.clear()
+    // Find out current color theme
+    const themeName = vscode.workspace.getConfiguration('workbench').get('colorTheme')
+
+    if (typeof themeName !== 'string') {
+        // console.warn('workbench.colorTheme is', themeName)
+        return
+    }
+    // Try to load colors from that theme
+    try {
+        loadThemeNamed(themeName)
+    } catch (e) {
+        // console.warn('failed to load theme', themeName, e)
+    }
+}
+
+// Find current theme on disk
+function loadThemeNamed(themeName: string) {
+
+    const themePaths = vscode.extensions.all
+        .filter(extension => extension.extensionKind === vscode.ExtensionKind.UI)
+        .filter(extension => extension.packageJSON.contributes)
+        .filter(extension => extension.packageJSON.contributes.themes)
+        .reduce((list, extension) => {
+            const paths = extension.packageJSON.contributes.themes
+                .filter((element: any) => (element.id || element.label) === themeName)
+                .map((element: any) => path.join(extension.extensionPath, element.path))
+            return list.concat(paths)
+        }, Array<string>());
+
+
+    themePaths.forEach(loadThemeFile);
+
+    const customization: any = vscode.workspace.getConfiguration('editor').get('tokenColorCustomizations');
+    if (customization && customization.textMateRules) {
+        loadColors(customization.textMateRules)
+    }
+}
+
+function loadThemeFile(themePath: string) {
+
+    if (checkFileExists(themePath)) {
+        const themeContentText: string = readFileText(themePath)
+
+        const themeContent: any = JSON.parse(themeContentText)
+
+        if (themeContent && themeContent.tokenColors) {
+            loadColors(themeContent.tokenColors)
+            if (themeContent.include) {
+                // parse included theme file
+                const includedThemePath: string = path.join(path.dirname(themePath), themeContent.include)
+                loadThemeFile(includedThemePath)
+            }
+        }
+    }
+}
+function mergeRuleSettings(defaultSetting: TextMateRuleSettings, override: TextMateRuleSettings): TextMateRuleSettings {
+    const mergedRule = defaultSetting;
+
+    mergedRule.background = override.background || defaultSetting.background
+    mergedRule.foreground = override.foreground || defaultSetting.foreground
+    mergedRule.fontStyle = override.fontStyle || defaultSetting.foreground;
+
+    return mergedRule;
+}
+
+function loadColors(textMateRules: TextMateRule[]): void {
+    for (const rule of textMateRules) {
+
+        if (typeof rule.scope === 'string') {
+            const existingRule = rules.get(rule.scope);
+            if (existingRule) {
+                rules.set(rule.scope, mergeRuleSettings(existingRule, rule.settings))
+            }
+            else {
+                rules.set(rule.scope, rule.settings)
+            }
+        } else if (rule.scope instanceof Array) {
+            for (const scope of rule.scope) {
+                const existingRule = rules.get(scope);
+                if (existingRule) {
+                    rules.set(scope, mergeRuleSettings(existingRule, rule.settings))
+                }
+                else {
+                    rules.set(scope, rule.settings)
+                }
+            }
+        }
+    }
+}
+
+function checkFileExists(filePath: string): boolean {
+
+    const stats = fs.statSync(filePath);
+    if (stats && stats.isFile()) {
+        return true;
+    } else {
+        // console.warn('no such file', filePath)
+        return false;
+    }
+
+
+}
+
+function readFileText(filePath: string, encoding: string = 'utf8'): string {
+    return fs.readFileSync(filePath, encoding);
+}
\ No newline at end of file
diff --git a/editors/code/src/scopes_mapper.ts b/editors/code/src/scopes_mapper.ts
new file mode 100644
index 000000000..4534d8a32
--- /dev/null
+++ b/editors/code/src/scopes_mapper.ts
@@ -0,0 +1,48 @@
+import * as vscode from 'vscode'
+import { TextMateRuleSettings } from './scopes'
+
+
+
+
+let mappings = new Map<string, string[]>()
+
+
+const defaultMapping = new Map<string, string[]>([
+    ['comment', ['comment', 'comment.block', 'comment.line', 'comment.block.documentation']],
+    ['string', ['string']],
+    ['keyword', ['keyword']],
+    ['keyword.control', ['keyword.control', 'keyword', 'keyword.other']],
+    ['keyword.unsafe', ['storage.modifier', 'keyword.other', 'keyword.control', 'keyword']],
+    ['function', ['entity.name.function']],
+    ['parameter', ['variable.parameter']],
+    ['constant', ['constant', 'variable']],
+    ['type', ['entity.name.type']],
+    ['builtin', ['variable.language', 'support.type', 'support.type']],
+    ['text', ['string', 'string.quoted', 'string.regexp']],
+    ['attribute', ['keyword']],
+    ['literal', ['string', 'string.quoted', 'string.regexp']],
+    ['macro', ['support.other']],
+    ['variable', ['variable']],
+    ['variable.mut', ['variable', 'storage.modifier']],
+    ['field', ['variable.object.property', 'meta.field.declaration', 'meta.definition.property', 'variable.other',]],
+    ['module', ['entity.name.section', 'entity.other']]
+]
+)
+function find(scope: string): string[] {
+    return mappings.get(scope) || []
+}
+
+export function toRule(scope: string, intoRule: (scope: string) => TextMateRuleSettings | undefined): TextMateRuleSettings | undefined {
+    return find(scope).map(intoRule).filter(rule => rule !== undefined)[0];
+}
+
+
+export function load() {
+    const configuration = vscode.workspace
+        .getConfiguration('rust-analyzer')
+        .get('scopeMappings') as Map<string, string[]> | undefined || new Map()
+
+    mappings = new Map([...Array.from(defaultMapping.entries()), ...Array.from(configuration.entries())]);
+
+
+}
\ No newline at end of file