Skip to content

Commit e60cf75

Browse files
Merge pull request apache#8053 from matthiasblaesing/keyframes
CSS: Fix parsing of @Keyframes rules
2 parents be051eb + abf6ceb commit e60cf75

File tree

6 files changed

+13582
-13147
lines changed

6 files changed

+13582
-13147
lines changed

ide/css.lib/nbproject/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
javac.source=1.8
18+
javac.release=17
1919
javac.compilerargs=-Xlint -Xlint:-serial
2020
is.autoload=true
2121

ide/css.lib/src/org/netbeans/modules/css/lib/Css3.g

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ moz_document_function
731731
//http://developer.apple.com/library/safari/#documentation/appleapplications/reference/SafariCSSRef/Articles/OtherStandardCSS3Features.html#//apple_ref/doc/uid/TP40007601-SW1
732732
webkitKeyframes
733733
:
734-
WEBKIT_KEYFRAMES_SYM ws? atRuleId ws?
734+
( WEBKIT_KEYFRAMES_SYM | KEYFRAMES_SYM | {tokenNameEquals("@-moz-keyframes")}? AT_IDENT | {tokenNameEquals("@-o-keyframes")}? AT_IDENT ) ws? atRuleId ws?
735735
LBRACE ws?
736736
( webkitKeyframesBlock ws? )*
737737
RBRACE
@@ -1261,7 +1261,7 @@ cp_variable_declaration
12611261
cp_variable
12621262
:
12631263
//every token which might possibly begin with the at sign
1264-
{isLessSource()}? ( AT_IDENT | IMPORT_SYM | PAGE_SYM | MEDIA_SYM | NAMESPACE_SYM | CHARSET_SYM | COUNTER_STYLE_SYM | FONT_FACE_SYM | TOPLEFTCORNER_SYM | TOPLEFT_SYM | TOPCENTER_SYM | TOPRIGHT_SYM | TOPRIGHTCORNER_SYM | BOTTOMLEFTCORNER_SYM | BOTTOMLEFT_SYM | BOTTOMCENTER_SYM | BOTTOMRIGHT_SYM | BOTTOMRIGHTCORNER_SYM | LEFTTOP_SYM | LEFTMIDDLE_SYM | LEFTBOTTOM_SYM | RIGHTTOP_SYM | RIGHTMIDDLE_SYM | RIGHTBOTTOM_SYM | MOZ_DOCUMENT_SYM | WEBKIT_KEYFRAMES_SYM | SASS_CONTENT | SASS_MIXIN | SASS_INCLUDE | SASS_EXTEND | SASS_DEBUG | SASS_WARN | SASS_IF | SASS_ELSE | SASS_FOR | SASS_FUNCTION | SASS_RETURN | SASS_EACH | SASS_WHILE | SASS_AT_ROOT | SASS_USE | SASS_FORWARD )
1264+
{isLessSource()}? ( AT_IDENT | IMPORT_SYM | PAGE_SYM | MEDIA_SYM | NAMESPACE_SYM | CHARSET_SYM | COUNTER_STYLE_SYM | FONT_FACE_SYM | TOPLEFTCORNER_SYM | TOPLEFT_SYM | TOPCENTER_SYM | TOPRIGHT_SYM | TOPRIGHTCORNER_SYM | BOTTOMLEFTCORNER_SYM | BOTTOMLEFT_SYM | BOTTOMCENTER_SYM | BOTTOMRIGHT_SYM | BOTTOMRIGHTCORNER_SYM | LEFTTOP_SYM | LEFTMIDDLE_SYM | LEFTBOTTOM_SYM | RIGHTTOP_SYM | RIGHTMIDDLE_SYM | RIGHTBOTTOM_SYM | MOZ_DOCUMENT_SYM | WEBKIT_KEYFRAMES_SYM | SASS_CONTENT | SASS_MIXIN | SASS_INCLUDE | SASS_EXTEND | SASS_DEBUG | SASS_WARN | SASS_IF | SASS_ELSE | SASS_FOR | SASS_FUNCTION | SASS_RETURN | SASS_EACH | SASS_WHILE | SASS_AT_ROOT | SASS_USE | SASS_FORWARD | KEYFRAMES_SYM )
12651265
|
12661266
{isScssSource()}? ( SASS_VAR | IDENT DOT SASS_VAR )
12671267
;
@@ -2003,6 +2003,7 @@ FONT_FACE_SYM : '@FONT-FACE';
20032003
SUPPORTS_SYM : '@SUPPORTS';
20042004
LAYER_SYM : '@LAYER';
20052005
CONTAINER_SYM : '@CONTAINER';
2006+
KEYFRAMES_SYM : '@KEYFRAMES';
20062007

20072008
TOPLEFTCORNER_SYM :'@TOP-LEFT-CORNER';
20082009
TOPLEFT_SYM :'@TOP-LEFT';

0 commit comments

Comments
 (0)