Themes: Fix invalid list/mapping highlighting

Fixes #274 Scope unexpected value types more gracefully to avoid breaking syntax highlighting of the following content.
SublimeText · Feb 22, 2020 · 3f19748 · 3f19748
1 parent a54feb8
commit 3f19748
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/Package/Sublime JSON/Sublime JSON.sublime-syntax b/Package/Sublime JSON/Sublime JSON.sublime-syntax
@@ -160,6 +160,14 @@ contexts:
 
   expect-string-rest:
     - include: comments
+    - match: \{
+      set:
+        - meta_scope: invalid.illegal.expected-string.sublime
+        - include: in-mapping-ignored
+    - match: \[
+      set:
+        - meta_scope: invalid.illegal.expected-string.sublime
+        - include: in-sequence-ignored
     - match: \s*(?=[},\]])
       scope: invalid.illegal.expected-string.sublime
       pop: true
@@ -281,6 +289,10 @@ contexts:
 
   expect-sequence-rest:
     - include: comments
+    - match: \{
+      set:
+        - meta_scope: invalid.illegal.expected-sequence.sublime
+        - include: in-mapping-ignored
     - match: \s*(?=[},\]])
       scope: invalid.illegal.expected-sequence.sublime
       pop: true
@@ -312,6 +324,11 @@ contexts:
     - match: \S
       scope: invalid.illegal.expected-comma.inside-sequence.json
 
+  in-sequence-ignored:
+    - match: \]
+      pop: true
+    - match: \[
+      push: in-sequence-ignored
 
 #################################################
 # Mapping
@@ -338,6 +355,10 @@ contexts:
 
   expect-mapping-rest:
     - include: comments
+    - match: \[
+      set:
+        - meta_scope: invalid.illegal.expected-mapping.sublime
+        - include: in-sequence-ignored
     - match: \s*(?=[},\]])
       scope: invalid.illegal.expected-mapping.sublime
       pop: true
@@ -422,6 +443,11 @@ contexts:
     - match: ''
       pop: true
 
+  in-mapping-ignored:
+    - match: \}
+      pop: true
+    - match: \{
+      push: in-mapping-ignored
 
 #################################################
 # Special Values

diff --git a/Package/Sublime Text Theme/syntax_test_newstyletheme.json b/Package/Sublime Text Theme/syntax_test_newstyletheme.json
@@ -75,6 +75,12 @@
 //                                                   ^^^^^^^^^^ meta.rule-key.attributes.sublime-theme string.quoted.double.json storage.modifier.selector.sublime-theme
 //                                                                  ^ keyword.operator.logical.sublime-theme
 //                                                                   ^^^^^^^^ entity.other.attribute-name.sublime-theme
+            "parents": [["class": "button_control", "attributes": ["!selected"]]],
+//           ^^^^^^^ meta.rule-key.parents.sublime-theme string.quoted.double.json storage.modifier.selector.sublime-theme
+//                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.sequence.json meta.parents-sequence.sublime-theme
+//                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid.illegal.expected-mapping.sublime
+//                                                                              ^ - invalid
+//
             "platforms": ["windows", "osx", "linux"],
 //           ^^^^^^^^^ meta.rule-key.platforms.sublime-theme string.quoted.double.json storage.modifier.selector.sublime-theme
 //                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.sequence.json meta.platforms-sequence.sublime-theme
@@ -207,6 +213,10 @@
             },
             "layer0.texture": null,
 //                            ^^^^ constant.language.null.json
+
+            "layer0.texture": [255, 255, 255, 255],
+//                            ^^^^^^^^^^^^^^^^^^^^ invalid.illegal.expected-string.sublime
+//                                                ^ - invalid
         },
         {
             "class": "scroll_area_control",
@@ -234,6 +244,13 @@
             "right_shadow": "black",
 //           ^^^^^^^^^^^^ keyword.other.rule.sublime-theme
 //                           ^^^^^ support.constant.color.w3c-standard-color-name.css
+            "right_shadow": [0, 0, 0, 255],
+//           ^^^^^^^^^^^^ keyword.other.rule.sublime-theme
+//                          ^^^^^^^^^^^^^^ meta.sequence.json
+            "right_shadow": {"key": "value"},
+//           ^^^^^^^^^^^^ keyword.other.rule.sublime-theme
+//                          ^^^^^^^^^^^^^^^^ invalid.illegal.expected-sequence.sublime
+//                                          ^ - invalid
             "right_shadow_size": 6,
 //           ^^^^^^^^^^^^^^^^^ keyword.other.rule.sublime-theme
 //                               ^ constant.numeric.json