Merge branch 'main' of https://github.com/bookjam/vscode-jamkit

bookjam · Jan 16, 2023 · 74beb7d · 74beb7d
2 parents 97412f1 + 526103a
commit 74beb7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/generate-syntax.py b/generate-syntax.py
@@ -58,7 +58,7 @@
     "match": "(__KEY__)\\s*__SEP__\\s*((__VALUE_REGEX__)[^__TERM__\\s]+)",
     "captures": {
         "1": { "name": "__STYLE_PROP_NAME__" },
-        "2": { "name": "__STYLE_PROP_WRONG_VALUE__" }
+        "2": { "name": "__STYLE_INVALID__" }
     }
 },
 {
@@ -67,7 +67,7 @@
         "1": { "name": "__STYLE_PROP_NAME__" },
         "3": { "name": "__STYLE_PROP_VALUE__" },
         "4": { "name": "__STYLE_VARIABLE__" },
-        "__WRONG_VALUE_INDEX__": { "name": "__STYLE_PROP_WRONG_VALUE__" }
+        "__WRONG_VALUE_INDEX__": { "name": "__STYLE_INVALID__" }
     }
 }'''
 
@@ -96,7 +96,7 @@
     "name": "__STYLE_LENGTH__",
     "match": "[+-]?([0-9]*[.])?[0-9]+(pw|ph|cw|ch|mt|mr|mb|ml|sbh|eb|%)?",
     "captures": {
-        "4": "__STYLE_PROP_WRONG_VALUE__"
+        "4": "__STYLE_INVALID__"
     }
 }
 '''
@@ -128,8 +128,8 @@
     # common styles
     '__STYLE_PROP_NAME__':          'entity.other.attribute-name',
     '__STYLE_PROP_VALUE__':         'string',
-    '__STYLE_PROP_WRONG_VALUE__':   'invalid.illegal',
     '__STYLE_PROP_SEP__':           'keyword.operator',
+    '__STYLE_INVALID__':            'invalid.illegal',
     '__STYLE_VARIABLE__':           'string markup.italic',
     '__STYLE_FILENAME__':           'string',
     '__STYLE_LENGTH__':             'constant.numeric',

diff --git a/sbss.tmLanguage.template.json b/sbss.tmLanguage.template.json
@@ -84,6 +84,11 @@
         },
         "property-group": {
             "patterns": [
+                {
+                    "match": "([a-z-]+(@[a-z-]+)?)\\s*=.*$",
+                    "name": "__STYLE_INVALID__",
+                    "comment": "A common mistake - property list style pair in property group."
+                },
                 "__PROP_GROUP_PATTERNS__"
             ]
         },