TM: Highlight path, fix integer literals, match generic params for variable/const.

Author: cbuttner

syntaxes/c3.tmLanguage.json

@@ -71,7 +71,7 @@
             },
             {
               "match": "(?:_*[a-z][_a-zA-Z0-9]*)",
-              "name": "meta.path.c3"
+              "name": "meta.path.c3 entity.name.scope-resolution.c3"
             },
             {
               "include": "#generic_params"
@@ -103,7 +103,7 @@
             },
             {
               "match": "(?:_*[a-z][_a-zA-Z0-9]*)",
-              "name": "meta.path.c3"
+              "name": "meta.path.c3 entity.name.scope-resolution.c3"
             },
             {
               "match": ",",
@@ -865,8 +865,18 @@
           "name": "constant.language.c3"
         },
         {
-          "match": "\\b(?:_*[A-Z][_A-Z0-9]*)\\b",
-          "name": "variable.other.constant"
+          "begin": "\\b(?:_*[A-Z][_A-Z0-9]*)\\b",
+          "beginCaptures": {
+            "0": {
+              "name": "variable.other.constant.c3"
+            }
+          },
+          "end": "(?=[^{\\s])|(?<=\\})",
+          "patterns": [
+            {
+              "include": "#generic_params"
+            }
+          ]
         }
       ]
     },
@@ -918,7 +928,7 @@
       "match": "((?:_*[a-z][_a-zA-Z0-9]*))(::)",
       "captures": {
         "1": {
-          "name": "meta.path.c3"
+          "name": "meta.path.c3 entity.name.scope-resolution.c3"
         },
         "2": {
           "name": "meta.path.c3 punctuation.separator.scope-resolution.c3"
@@ -1027,7 +1037,7 @@
       ]
     },
     "integer_literal": {
-      "match": "\\b(?:[0-9](?:_?[0-9])*|0[xX][a-fA-F0-9](?:_?[a-fA-F0-9])*|0[oO][0-7](_?[0-7])*|0[bB][0-1](_?[0-1])*)(?:[ui](?:8|16|32|64|128)|[Uu][Ll]?|[Ll])?",
+      "match": "\\b(?:0[xX][a-fA-F0-9](?:_?[a-fA-F0-9])*|0[oO][0-7](_?[0-7])*|0[bB][0-1](_?[0-1])*|[0-9](?:_?[0-9])*)(?:[ui](?:8|16|32|64|128)|[Uu][Ll]?|[Ll])?",
       "name": "constant.numeric.integer.c3"
     },
     "bytes_literal": {
@@ -1481,8 +1491,18 @@
       ]
     },
     "variable": {
-      "match": "(?<!#)\\$?\\b(?:_*[a-z][_a-zA-Z0-9]*)\\b",
-      "name": "variable.other.c3"
+      "begin": "(?<!#)\\$?\\b(?:_*[a-z][_a-zA-Z0-9]*)\\b",
+      "beginCaptures": {
+        "0": {
+          "name": "variable.other.c3"
+        }
+      },
+      "end": "(?=[^{\\s])|(?<=\\})",
+      "patterns": [
+        {
+          "include": "#generic_params"
+        }
+      ]
     },
     "expression": {
       "patterns": [

syntaxes/c3.tmLanguage.yml

@@ -43,7 +43,7 @@ repository:
           - include: "#attribute"
           - include: "#path"
           - match: '{{IDENT}}'
-            name: meta.path.c3
+            name: meta.path.c3 entity.name.scope-resolution.c3
           - include: "#generic_params"
 
       # Import
@@ -58,7 +58,7 @@ repository:
           - include: "#attribute"
           - include: "#path"
           - match: '{{IDENT}}'
-            name: meta.path.c3
+            name: meta.path.c3 entity.name.scope-resolution.c3
           - match: ','
             name: punctuation.separator.c3
 
@@ -427,8 +427,15 @@ repository:
     patterns:
       - match: '\b(true|false|null)\b'
         name: constant.language.c3
-      - match: '\b{{CONST}}\b'
-        name: variable.other.constant
+      # - match: '\b{{CONST}}\b'
+      #   name: variable.other.constant
+      - begin: '\b{{CONST}}\b'
+        beginCaptures: {
+          0: { name: variable.other.constant.c3 }
+        }
+        end: '(?=[^{\s])|(?<=\})'
+        patterns:
+          - include: "#generic_params"
 
   operators:
     patterns:
@@ -456,7 +463,7 @@ repository:
   path:
     match: '({{IDENT}})(::)'
     captures:
-      1: { name: meta.path.c3 }
+      1: { name: meta.path.c3 entity.name.scope-resolution.c3 }
       2: { name: meta.path.c3 punctuation.separator.scope-resolution.c3 }
 
   literals:
@@ -514,7 +521,7 @@ repository:
         name: constant.numeric.float.c3
 
   integer_literal:
-    match: '\b(?:{{INT}}|0[xX]{{HINT}}|0[oO]{{OINT}}|0[bB]{{BINT}}){{INTTYPE}}?'
+    match: '\b(?:0[xX]{{HINT}}|0[oO]{{OINT}}|0[bB]{{BINT}}|{{INT}}){{INTTYPE}}?'
     name: constant.numeric.integer.c3
 
   bytes_literal:
@@ -753,8 +760,14 @@ repository:
       - include: "#expression"
 
   variable:
-    match: '(?<!#)\$?\b{{IDENT}}\b'
-    name: variable.other.c3
+    # match: '(?<!#)\$?\b{{IDENT}}\b'
+    # name: variable.other.c3
+    begin: '(?<!#)\$?\b{{IDENT}}\b'
+    beginCaptures:
+      0: { name: variable.other.c3 }
+    end: '(?=[^{\s])|(?<=\})'
+    patterns:
+      - include: "#generic_params"
 
   expression:
     patterns: