Made the syntax highlighters more tolerant.

zeroc-ice · Dec 2, 2024 · 6c4d4db · 6c4d4db
1 parent 77abd6a
commit 6c4d4db
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/syntaxes/ice.tmLanguage.json b/syntaxes/ice.tmLanguage.json
@@ -7,10 +7,18 @@
     ],
 
     "patterns": [
-        {"include": "#comment"},
-        {"include": "#preprocessor"},
-        {"include": "#metadata.global"},
-        {"include": "#storage.module"}
+        {"include": "#standard"},
+        {"include": "#metadata"},
+        {"include": "#constant"},
+        {"include": "#storage.module"},
+        {"include": "#storage.enum"},
+        {"include": "#storage.struct"},
+        {"include": "#storage.sequence"},
+        {"include": "#storage.dictionary"},
+        {"include": "#storage.interface"},
+        {"include": "#storage.exception"},
+        {"include": "#storage.class"},
+        {"include": "#storage.operation"}
     ],
 
     "repository": {
@@ -68,9 +76,9 @@
 
         "preprocessor": {
             "patterns": [
-                {"include": "#preprocessor.if"},
                 {"include": "#preprocessor.ifdef"},
                 {"include": "#preprocessor.ifndef"},
+                {"include": "#preprocessor.if"},
                 {"include": "#preprocessor.elif"},
                 {"include": "#preprocessor.else"},
                 {"include": "#preprocessor.endif"},

diff --git a/syntaxes/slice.tmLanguage.json b/syntaxes/slice.tmLanguage.json
@@ -14,6 +14,7 @@
         "slice": {
             "patterns": [
                 {"include": "#standard"},
+                {"include": "#string-literal"},
                 {"include": "#compilation-mode"},
                 {"include": "#module-declaration"},
                 {"include": "#struct"},
@@ -24,6 +25,7 @@
                 {"include": "#custom-type"},
                 {"include": "#type-alias"},
                 {"include": "#modifier-keywords"},
+                {"include": "#operation"},
                 {"include": "#type.identifier"}
             ]
         },
@@ -818,6 +820,11 @@
             "beginCaptures": {
                 "0": {"name": "punctuation.brace.open.slice"}
             },
+            "patterns": [
+                {"include": "#slice"}
+            ]
+        },
+        "operation": {
             "patterns": [
                 {"include": "#tag"},
                 {
@@ -885,8 +892,7 @@
                             "patterns": [{"include": "#field.identifier"}]
                         }
                     }
-                },
-                {"include": "#slice"}
+                }
             ]
         },
         "parameter": {