Merge pull request #8104 from matthiasblaesing/css_at_rule_space_brace

CSS: Improve parsing of custom @-rules
apache · Jan 11, 2025 · b556042 · b556042
2 parents 9f32bc2 + 6d3af5e
commit b556042
Show file tree

Hide file tree

Showing 4 changed files with 10,255 additions and 10,390 deletions.
diff --git a/ide/css.lib/src/org/netbeans/modules/css/lib/Css3.g b/ide/css.lib/src/org/netbeans/modules/css/lib/Css3.g
@@ -104,7 +104,7 @@ package org.netbeans.modules.css.lib;
     private boolean tokenNameEquals(String tokenImage) {
         return tokenImage.equalsIgnoreCase(input.LT(1).getText());
     }
-    
+
     private boolean tokenNameEquals2(String tokenImage) {
         return tokenImage.equalsIgnoreCase(input.LT(2).getText());
     }
@@ -713,7 +713,7 @@ atRuleId
 	;
 
 generic_at_rule
-    : AT_IDENT ws ((LBRACE) => braceBlock2 | (componentValue) => componentValue) ((ws (LBRACE | (componentValue) => componentValue)) => (ws ((LBRACE) => braceBlock2 | (componentValue) => componentValue)))*;
+    : {! tokenNameEquals("@charset")}? AT_IDENT (( ~ (SEMI | LBRACE)) => componentValue )* ((LBRACE) => braceBlock2 | SEMI);
 
 moz_document
 	: