Skip to content
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

Jump to bottom

add support for <timeline-range-name> in @keyframes #355

Merged
merged 3 commits into from
Sep 25, 2023
Merged

add support for <timeline-range-name> in @keyframes #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48fdff8
add support for <timeline-range-name> in at-keyframes
romainmenke Jun 9, 2023
ca45faa
Merge branch 'main' into timeline-range-name--amiable-axolotl-ff8c85f649
romainmenke Sep 7, 2023
10dc546
Merge branch 'main' into timeline-range-name--amiable-axolotl-ff8c85f649
romainmenke Sep 25, 2023
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
44 changes: 40 additions & 4 deletions src/parser/cssParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,12 +805,30 @@ export class Parser {
public _parseKeyframeSelector(): nodes.Node | null {
const node = this.create(nodes.KeyframeSelector);

if (!node.addChild(this._parseIdent()) && !this.accept(TokenType.Percentage)) {
let hasContent = false;
if (node.addChild(this._parseIdent())) {
hasContent = true;
}

if (this.accept(TokenType.Percentage)) {
hasContent = true;
}

if (!hasContent) {
return null;
}

while (this.accept(TokenType.Comma)) {
if (!node.addChild(this._parseIdent()) && !this.accept(TokenType.Percentage)) {
hasContent = false;
if (node.addChild(this._parseIdent())) {
hasContent = true;
}

if (this.accept(TokenType.Percentage)) {
hasContent = true;
}

if (!hasContent) {
return this.finish(node, ParseError.PercentageExpected);
}
}
Expand All @@ -822,12 +840,30 @@ export class Parser {
const node = this.create(nodes.KeyframeSelector);
const pos = this.mark();

if (!node.addChild(this._parseIdent()) && !this.accept(TokenType.Percentage)) {
let hasContent = false;
if (node.addChild(this._parseIdent())) {
hasContent = true;
}

if (this.accept(TokenType.Percentage)) {
hasContent = true;
}

if (!hasContent) {
return null;
}

while (this.accept(TokenType.Comma)) {
if (!node.addChild(this._parseIdent()) && !this.accept(TokenType.Percentage)) {
hasContent = false;
if (node.addChild(this._parseIdent())) {
hasContent = true;
}

if (this.accept(TokenType.Percentage)) {
hasContent = true;
}

if (!hasContent) {
this.restoreAtMark(pos);
return null;
}
Expand Down
15 changes: 15 additions & 0 deletions src/test/css/parser.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,20 @@ suite('CSS - Parser', () => {
assertNode('to {}', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('0% {}', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('10% {}', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('cover 10% {}', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('100000% {}', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('from { width: 100% }', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('from { width: 100%; to: 10px; }', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('from, to { width: 10px; }', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('10%, to { width: 10px; }', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('from, 20% { width: 10px; }', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('10%, 20% { width: 10px; }', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('cover 10% {}', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('cover 10%, exit 20% {}', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('10%, exit 20% {}', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('from, exit 20% {}', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('cover 10%, to {}', parser, parser._parseKeyframeSelector.bind(parser));
assertNode('cover 10%, 20% {}', parser, parser._parseKeyframeSelector.bind(parser));
});

test('@keyframe', function () {
Expand All @@ -143,10 +154,14 @@ suite('CSS - Parser', () => {
assertNode('@keyframes name { from { top: 0px; } 80% { top: 100px; } 100% { top: 50px; }}', parser, parser._parseKeyframe.bind(parser));
assertNode('@keyframes name { from { top: 0px; } 70%, 80% { top: 100px; } 100% { top: 50px; }}', parser, parser._parseKeyframe.bind(parser));
assertNode('@keyframes name { from { top: 0px; left: 1px; right: 2px }}', parser, parser._parseKeyframe.bind(parser));
assertNode('@keyframes name { exit 50% { top: 0px; left: 1px; right: 2px }}', parser, parser._parseKeyframe.bind(parser));
assertError('@keyframes name { from { top: 0px; left: 1px, right: 2px }}', parser, parser._parseKeyframe.bind(parser), ParseError.SemiColonExpected);
assertError('@keyframes )', parser, parser._parseKeyframe.bind(parser), ParseError.IdentifierExpected);
assertError('@keyframes name { { top: 0px; } }', parser, parser._parseKeyframe.bind(parser), ParseError.RightCurlyExpected);
assertError('@keyframes name { from, #123', parser, parser._parseKeyframe.bind(parser), ParseError.PercentageExpected);
assertError('@keyframes name { 10% from { top: 0px; } }', parser, parser._parseKeyframe.bind(parser), ParseError.LeftCurlyExpected);
assertError('@keyframes name { 10% 20% { top: 0px; } }', parser, parser._parseKeyframe.bind(parser), ParseError.LeftCurlyExpected);
assertError('@keyframes name { from to { top: 0px; } }', parser, parser._parseKeyframe.bind(parser), ParseError.LeftCurlyExpected);
});

test('@property', function () {
Expand Down
Loading