Apply a separate semantic highlighting for global variables

Author: HighCommander4

package.json

@@ -251,6 +251,11 @@
           "default": false,
           "description": "If semantic highlighting for static member variables is enabled/disabled."
         },
+        "cquery.highlighting.enabled.globalVariables": {
+          "type": "boolean",
+          "default": false,
+          "description": "If semantic highlighting for global variables is enabled/disabled."
+        },
         "cquery.highlighting.colors.types": {
           "type": "array",
           "default": [
@@ -475,6 +480,22 @@
           ],
           "description": "Colors to use for semantic highlighting. A good generator is http://tools.medialab.sciences-po.fr/iwanthue/. If multiple colors are specified, semantic highlighting will cycle through them for successive symbols."
         },
+        "cquery.highlighting.colors.globalVariables": {
+          "type": "array",
+          "default": [
+            "#587d87",
+            "#26cdca",
+            "#397797",
+            "#57c2cc",
+            "#306b72",
+            "#6cbcdf",
+            "#368896",
+            "#3ea0d2",
+            "#48a5af",
+            "#7ca6b7"
+          ],
+          "description": "Colors to use for semantic highlighting. A good generator is http://tools.medialab.sciences-po.fr/iwanthue/. If multiple colors are specified, semantic highlighting will cycle through them for successive symbols."
+        },
         "cquery.highlighting.underline.types": {
           "type": "boolean",
           "default": false
@@ -531,6 +552,10 @@
           "type": "boolean",
           "default": true
         },
+        "cquery.highlighting.underline.globalVariables": {
+          "type": "boolean",
+          "default": false
+        },
         "cquery.highlighting.italic.types": {
           "type": "boolean",
           "default": false
@@ -587,6 +612,10 @@
           "type": "boolean",
           "default": false
         },
+        "cquery.highlighting.italic.globalVariables": {
+          "type": "boolean",
+          "default": false
+        },
         "cquery.highlighting.bold.types": {
           "type": "boolean",
           "default": true
@@ -643,6 +672,10 @@
           "type": "boolean",
           "default": false
         },
+        "cquery.highlighting.bold.globalVariables": {
+          "type": "boolean",
+          "default": false
+        },
         "cquery.index.extraClangArguments": {
           "type": "array",
           "default": [],

src/extension.ts

@@ -24,6 +24,13 @@ function setContext(name, value) {
 // internal number.
 const VERSION = 3;
 
+enum SymbolKind {
+  Invalid,
+  File,
+  Type,
+  Func,
+  Var
+}
 enum SemanticSymbolKind {
   Unknown,
 
@@ -70,9 +77,9 @@ enum StorageClass {
 }
 class SemanticSymbol {
   constructor(
-      readonly stableId: number, readonly kind: SemanticSymbolKind,
-      readonly isTypeMember: boolean, readonly storage: StorageClass,
-      readonly ranges: Array<Range>) {}
+      readonly stableId: number, readonly parentKind: SymbolKind,
+      readonly kind: SemanticSymbolKind, readonly isTypeMember: boolean, 
+      readonly storage: StorageClass, readonly ranges: Array<Range>) {}
 }
 
 function getClientConfig(context: ExtensionContext) {
@@ -669,7 +676,7 @@ export function activate(context: ExtensionContext) {
               'freeStandingVariables', 'memberVariables', 'namespaces',
               'macros', 'enums', 'typeAliases', 'enumConstants',
               'staticMemberFunctions', 'parameters', 'templateParameters',
-              'staticMemberVariables']) {
+              'staticMemberVariables', 'globalVariables']) {
       semanticDecorations.set(type, makeDecorations(type));
       semanticEnabled.set(type, false);
     }
@@ -711,7 +718,10 @@ export function activate(context: ExtensionContext) {
       } else if (symbol.kind == SemanticSymbolKind.StaticMethod) {
         return get('staticMemberFunctions')
       } else if (symbol.kind == SemanticSymbolKind.Variable) {
-        return get('freeStandingVariables');
+        if (symbol.parentKind == SymbolKind.Func) {
+          return get('freeStandingVariables');
+        }
+        return get('globalVariables');
       } else if (symbol.kind == SemanticSymbolKind.Field) {
         return get('memberVariables');
       } else if (symbol.kind == SemanticSymbolKind.StaticProperty) {