fix: support syntax highlighting for oneliners (#266)

Support syntax highligthing for oneliners
equinor · Sep 1, 2023 · 608a0a5 · 608a0a5
1 parent f15b4f1
commit 608a0a5
Showing 1 changed file with 20 additions and 35 deletions.
diff --git a/syntaxes/septic.tmLanguage.json b/syntaxes/septic.tmLanguage.json
@@ -16,6 +16,15 @@
         {
             "include": "#tagmap"
         },
+        {
+            "include": "#numeric"
+        },
+        {
+            "include": "#bitfield"
+        },
+        { 
+            "include": "#variable"
+        },
         {
             "comment": "Should be removed and fix grps etc explicitly using begin/end instead",
             "include": "#string"
@@ -25,25 +34,13 @@
         "keyword": {
             "patterns": [
                 {
-                    "match": "\\b(\\w*)\\b(:)[\\s]*([\\w\\ \\{\\}\\*\\-<>]*)\\b",
+                    "match": "\\b(\\w+)(:)\\s",
                     "captures": {
                         "1": {
                             "name": "entity.name.class.septic"
                         },
                         "2": {
                             "name": "punctuation.separator.key-value.mapping.septic"
-                        },
-                        "3": {
-                            "name": "entity.other.variable.septic",
-                            "patterns": [
-                                {
-                                    "include": "source.jinja"
-                                },
-                                {
-                                    "name": "variable.name.septic",
-                                    "match": "\\b([\\w\\ \\{\\}\\*\\-<>]*)\\b"
-                                }
-                            ]
                         }
                     }
                 }
@@ -62,33 +59,13 @@
         "tagmap_default": {
             "patterns": [
                 {
-                    "match": "\\b(\\w*)\\b(=)[\\s]*(.*)$",
+                    "match": "\\b(\\w*)\\b(=)[\\s]+",
                     "captures": {
                         "1": {
                             "name": "entity.name.tag.septic"
                         },
                         "2": {
                             "name": "punctuation.separator.key-value.mapping.septic"
-                        },
-                        "3": {
-                            "name": "entity.other.variable.septic",
-                            "patterns": [
-                                {
-                                    "include": "source.jinja"
-                                },
-                                {
-                                    "include": "#line_comment"
-                                },
-                                {
-                                    "include": "#bitfield"
-                                },
-                                {
-                                    "include": "#numeric"
-                                },
-                                {
-                                    "include": "#string"
-                                }
-                            ]
                         }
                     }
                 }
@@ -98,7 +75,7 @@
             "comment": "Overrides regular tagmap for the Alg line in CalcPvr",
             "patterns": [
                 {
-                    "match": "^\\s*\\b(Alg)\\b(=)[\\s]*(\")(.*)(\")",
+                    "match": "\\b(Alg)\\b(=)[\\s]*(\")(.*?)(\")",
                     "captures": {
                         "1": {
                             "name": "entity.name.tag.septic"
@@ -139,6 +116,14 @@
                 }
             ]
         },
+        "variable": {
+            "patterns": [
+                {
+                    "match": "(\\{\\{[\\S\\s]+?\\}\\}|[\\w\\-\\*]+)+",
+                    "name": "variable.name.septic"
+                }
+            ]
+        },
         "calc": {
             "begin": "(\\w*)(\\()",
             "end": "\\)",