Account for CSS update

Thom1729 · May 6, 2023 · e4dac61 · e4dac61
1 parent a2a94ed
commit e4dac61
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/extensions/custom_templates/custom_templates.syntax-extension b/extensions/custom_templates/custom_templates.syntax-extension
@@ -88,7 +88,7 @@ contexts:
 
   styled-component-keyframes-end:
     - !with
-      - include: scope:source.js.css#at-keyframe-block-content
+      - include: scope:source.js.css#styled-components-keyframe-body
       - !include_resource Packages/JSCustom/extensions/custom_templates/template.yaml
     - include: else-pop
 

diff --git a/styled_components/Styled Components.sublime-syntax b/styled_components/Styled Components.sublime-syntax
@@ -10,11 +10,12 @@ contexts:
   main:
     - meta_prepend: true
     - match: (?=(?:{{html_tags}}|{{svg_tags}})(?!:))
-      push: selector-content
+      push: styled-components-selector-body
     - include: property-identifiers
     - include: property-values
 
   rule-list-body:
+    - meta_prepend: true
     - include: main
 
   comments:
@@ -29,9 +30,31 @@ contexts:
   selectors:
     - meta_prepend: true
     - match: (?=&)
-      push: selector-content
+      push: styled-components-selector-body
+
+  selector-body:
+    - meta_prepend: true
+    - match: \&
+      scope: variable.language.css.styled-components
 
   selector-content:
     - meta_prepend: true
     - match: \&
       scope: variable.language.css.styled-components
+
+  # Make sure that we handle both the old and new CSS context names
+  styled-components-selector-body:
+    - meta_scope: meta.selector.css
+    - include: selector-body
+    - include: selector-content
+
+  at-keyframe-block-body:
+    - meta_prepend: true
+
+  at-keyframe-block-content:
+    - meta_prepend: true
+
+  styled-components-keyframe-body:
+    - meta_scope: meta.at-rule.keyframe.css
+    - include: at-keyframe-block-body
+    - include: at-keyframe-block-content