Merge #1305

1305: Try to resolve name refs during highlighting r=matklad a=lnicola

Preview:

![image](https://user-images.githubusercontent.com/308347/58253075-43464a80-7d70-11e9-84cc-e81990f2d3eb.png)

This is probably not the cleanest implementation, but it's not clear to me what parts of `reference_definition` we don't want to run at this point. Also, is the `SourceAnalyzer` cheap enough to construct for each `NameRef`? Not like there's any alternative at this point, though.

Co-authored-by: Laurențiu Nicola <[email protected]>

2 files changed, 52 insertions, 2 deletions

diff --git a/editors/code/package.json b/editors/code/package.json
index 750c97bb1..cde5fbcb8 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -371,12 +371,57 @@
             },
             {
                 "id": "ralsp.macro",
-                "description": "Color for DFAF8F",
+                "description": "Color for macros",
                 "defaults": {
                     "dark": "#BFEBBF",
                     "light": "#DD6718",
                     "highContrast": "#ED7718"
                 }
+            },
+            {
+                "id": "ralsp.constant",
+                "description": "Color for constants",
+                "defaults": {
+                    "dark": "#569cd6",
+                    "light": "#267cb6",
+                    "highContrast": "#569cd6"
+                }
+            },
+            {
+                "id": "ralsp.type",
+                "description": "Color for types",
+                "defaults": {
+                    "dark": "#4EC9B0",
+                    "light": "#267F99",
+                    "highContrast": "#4EC9B0"
+                }
+            },
+            {
+                "id": "ralsp.field",
+                "description": "Color for fields",
+                "defaults": {
+                    "dark": "#4EC9B0",
+                    "light": "#267F99",
+                    "highContrast": "#4EC9B0"
+                }
+            },
+            {
+                "id": "ralsp.variable",
+                "description": "Color for variables",
+                "defaults": {
+                    "dark": "#4EC9B0",
+                    "light": "#267F99",
+                    "highContrast": "#4EC9B0"
+                }
+            },
+            {
+                "id": "ralsp.module",
+                "description": "Color for modules",
+                "defaults": {
+                    "dark": "#D4D4D4",
+                    "light": "#000000",
+                    "highContrast": "#FFFFFF"
+                }
             }
         ]
     }
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index e1a68544a..8389d94b8 100644
--- a/editors/code/src/highlighting.ts
+++ b/editors/code/src/highlighting.ts
@@ -33,11 +33,16 @@ export class Highlighter {
             colorContrib('keyword.unsafe'),
             colorContrib('function'),
             colorContrib('parameter'),
+            colorContrib('constant'),
+            colorContrib('type'),
             colorContrib('builtin'),
             colorContrib('text'),
             colorContrib('attribute'),
             colorContrib('literal'),
-            colorContrib('macro')
+            colorContrib('macro'),
+            colorContrib('variable'),
+            colorContrib('field'),
+            colorContrib('module')
         ];
 
         return new Map<string, vscode.TextEditorDecorationType>(decorations);