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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix capture groups for "each" statements #3274

Merged
merged 2 commits into from Feb 28, 2021
Merged

fix capture groups for "each" statements #3274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe4220f
fix: capture groups for each statements
error418 Jul 3, 2020
b38f240
test: add test cases for changes
error418 Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/pug-lexer/index.js
View file
Open in desktop
Expand Up @@ -1082,7 +1082,7 @@ Lexer.prototype = {

eachOf: function() {
var captures;
if ((captures = /^(?:each|for) (.*) of *([^\n]+)/.exec(this.input))) {
if ((captures = /^(?:each|for) (.*?) of *([^\n]+)/.exec(this.input))) {
this.consume(captures[0].length);
var tok = this.tok('eachOf', captures[1]);
tok.value = captures[1];
Expand Down
287 changes: 281 additions & 6 deletions packages/pug-lexer/test/__snapshots__/index.test.js.snap
View file
Open in desktop
Expand Up @@ -15468,12 +15468,12 @@ Array [
"loc": Object {
"end": Object {
"column": 1,
"line": 44,
"line": 45,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 1,
"line": 44,
"line": 45,
},
},
"type": "outdent",
Expand All @@ -15482,26 +15482,301 @@ Array [
"loc": Object {
"end": Object {
"column": 1,
"line": 44,
"line": 45,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 1,
"line": 44,
"line": 45,
},
},
"type": "outdent",
},
Object {
"buffer": false,
"loc": Object {
"end": Object {
"column": 74,
"line": 45,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 1,
"line": 44,
"line": 45,
},
},
"mustEscape": false,
"type": "code",
"val": "var ofKeyword = [{ name: 'tobi', friends: ['loki'] }, { name: 'loki' }]",
},
Object {
"loc": Object {
"end": Object {
"column": 1,
"line": 46,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 1,
"line": 44,
"line": 46,
},
},
"type": "newline",
},
Object {
"loc": Object {
"end": Object {
"column": 3,
"line": 46,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 1,
"line": 46,
},
},
"type": "tag",
"val": "ul",
},
Object {
"loc": Object {
"end": Object {
"column": 3,
"line": 47,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 1,
"line": 47,
},
},
"type": "indent",
"val": 2,
},
Object {
"code": "ofKeyword",
"loc": Object {
"end": Object {
"column": 24,
"line": 47,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 3,
"line": 47,
},
},
"type": "eachOf",
"val": "val",
"value": "val",
},
Object {
"loc": Object {
"end": Object {
"column": 5,
"line": 48,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 1,
"line": 48,
},
},
"type": "indent",
"val": 4,
},
Object {
"loc": Object {
"end": Object {
"column": 7,
"line": 48,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 5,
"line": 48,
},
},
"type": "tag",
"val": "li",
},
Object {
"buffer": true,
"loc": Object {
"end": Object {
"column": 18,
"line": 48,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 7,
"line": 48,
},
},
"mustEscape": true,
"type": "code",
"val": "user.name",
},
Object {
"loc": Object {
"end": Object {
"column": 1,
"line": 50,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 1,
"line": 50,
},
},
"type": "outdent",
},
Object {
"loc": Object {
"end": Object {
"column": 1,
"line": 50,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 1,
"line": 50,
},
},
"type": "outdent",
},
Object {
"loc": Object {
"end": Object {
"column": 3,
"line": 50,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 1,
"line": 50,
},
},
"type": "tag",
"val": "ul",
},
Object {
"loc": Object {
"end": Object {
"column": 3,
"line": 51,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 1,
"line": 51,
},
},
"type": "indent",
"val": 2,
},
Object {
"code": "[\\"variable with of keyword\\"]",
"loc": Object {
"end": Object {
"column": 43,
"line": 51,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 3,
"line": 51,
},
},
"type": "eachOf",
"val": "val",
"value": "val",
},
Object {
"loc": Object {
"end": Object {
"column": 5,
"line": 52,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 1,
"line": 52,
},
},
"type": "indent",
"val": 4,
},
Object {
"loc": Object {
"end": Object {
"column": 7,
"line": 52,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 5,
"line": 52,
},
},
"type": "tag",
"val": "li",
},
Object {
"buffer": true,
"loc": Object {
"end": Object {
"column": 12,
"line": 52,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 7,
"line": 52,
},
},
"mustEscape": true,
"type": "code",
"val": "val",
},
Object {
"loc": Object {
"end": Object {
"column": 12,
"line": 52,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 12,
"line": 52,
},
},
"type": "outdent",
},
Object {
"loc": Object {
"end": Object {
"column": 12,
"line": 52,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 12,
"line": 52,
},
},
"type": "outdent",
},
Object {
"loc": Object {
"end": Object {
"column": 12,
"line": 52,
},
"filename": "<basedir>/packages/pug-lexer/test/cases/each.else.pug",
"start": Object {
"column": 12,
"line": 52,
},
},
"type": "eos",
Expand Down
9 changes: 9 additions & 0 deletions packages/pug-lexer/test/cases/each.else.pug
View file
Open in desktop
Expand Up @@ -41,3 +41,12 @@ ul
li #{key}: #{val}
else
li user has no details!

- var ofKeyword = [{ name: 'tobi', friends: ['loki'] }, { name: 'loki' }]
ul
each val of ofKeyword
li= user.name

ul
each val of ["variable with of keyword"]
li= val