Skip to content

Update scss grammar file to fix those tickets: #8636, #8686 and #5799 #9365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Chris2011 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update scss grammar file to fix those tickets: #8636, #8686 and #5799 #9365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions ide/css.lib/src/org/netbeans/modules/css/lib/Css3.g
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ sass_use

sass_use_as
:
{tokenNameEquals("as")}? IDENT ws IDENT
{tokenNameEquals("as")}? IDENT ws (IDENT | STAR)
;

sass_use_with
Expand All @@ -371,7 +371,7 @@ sass_forward

sass_forward_as
:
{tokenNameEquals("as")}? IDENT ws IDENT
{tokenNameEquals("as")}? IDENT ws (IDENT | STAR)
;

sass_forward_with
Expand Down Expand Up @@ -433,6 +433,7 @@ mediaBodyItem
//Just a partial hotfix for nested MQ: complete grammar is defined in: http://www.w3.org/TR/css3-conditional/#processing
| media
| supportsAtRule
| containerAtRule
;

mediaQueryList
Expand Down Expand Up @@ -587,8 +588,8 @@ supportsDecl

containerAtRule options {backtrack=true;}
:
(CONTAINER_SYM ws containerCondition ws? LBRACE) => CONTAINER_SYM ws containerCondition ws? LBRACE ws? syncToFollow body? RBRACE
| CONTAINER_SYM ws containerName ws containerCondition ws? LBRACE ws? syncToFollow body? RBRACE
(CONTAINER_SYM ws containerCondition ws? LBRACE) => CONTAINER_SYM ws containerCondition ws? LBRACE ws? syncToFollow mediaBody? RBRACE
| CONTAINER_SYM ws containerName ws containerCondition ws? LBRACE ws? syncToFollow mediaBody? RBRACE
;

containerCondition
Expand Down Expand Up @@ -993,7 +994,7 @@ elementSubsequent
:
(
{isScssSource()}? sass_extend_only_selector
| {isCssPreprocessorSource()}? LESS_AND (IDENT | NUMBER | {isScssSource()}? sass_interpolation_expression_var)*
| {isCssPreprocessorSource()}? LESS_AND (IDENT | NUMBER | DIMENSION | {isScssSource()}? sass_interpolation_expression_var)*
| {isLessSource()}? LESS_AND less_selector_interpolation_exp
| cssId
| cssClass
Expand Down Expand Up @@ -1331,6 +1332,7 @@ cp_expression
| (ws? cp_expression_atom)=>ws? cp_expression_atom
)*)
| {isScssSource()}? LPAREN ws? syncToFollow sass_map_pairs? RPAREN
| {isScssSource()}? LBRACKET ws? (cp_expression_list ws?)? RBRACKET
;

cp_expression_operator
Expand Down Expand Up @@ -1417,7 +1419,7 @@ cp_mixin_block

cp_mixin_name
:
IDENT
IDENT ({isScssSource()}? DOT IDENT)*
;

cp_mixin_call_args
Expand Down Expand Up @@ -1737,7 +1739,7 @@ fragment URL : ((
| NMCHAR
)
(
'['|'!'|'#'|'$'|'%'|'&'|'*'|'~'|'.'|':'|'/'|'?'|'='|';'|','|'+'|'@'|'|' | WS | '\"' | '{' | '}'
'['|'!'|'#'|'$'|'%'|'&'|'*'|'~'|'.'|':'|'/'|'?'|'='|';'|','|'+'|'@'|'|' | WS | '\"' | '\'' | '{' | '}'
| NMCHAR
)*)?
;
Expand Down
Loading
Loading