Skip to content

Commit 29a53c5

Browse files
shirohanashirohana
authored
fix: Fix pug-lexer parsed escaped interpolations incorrectly (#3299)
* fix: Fix escaped interpolation returning `#{}` but not `!{}` * test: Update test case and snapshot of `pug-lexer/../interpolation.escape.pug` * style: Fix prettier format
1 parent 60b1b15 commit 29a53c5

File tree

3 files changed

+37
-48
lines changed

3 files changed

+37
-48
lines changed

‎packages/pug-lexer/index.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,11 @@ Lexer.prototype = {
579579
}
580580
if (indexOfStringInterp !== Infinity) {
581581
if (matchOfStringInterp[1]) {
582-
prefix = prefix + value.substring(0, indexOfStringInterp) + '#{';
582+
prefix =
583+
prefix +
584+
value.substring(0, indexOfStringInterp) +
585+
matchOfStringInterp[2] +
586+
'{';
583587
return this.addText(
584588
type,
585589
value.substring(indexOfStringInterp + 3),

‎packages/pug-lexer/test/__snapshots__/index.test.js.snap

+30-44
Original file line numberDiff line numberDiff line change
@@ -26702,31 +26702,17 @@ Array [
2670226702

2670326703
exports[`interpolation.escape.pug 1`] = `
2670426704
Array [
26705-
Object {
26706-
"loc": Object {
26707-
"end": Object {
26708-
"column": 1,
26709-
"line": 2,
26710-
},
26711-
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
26712-
"start": Object {
26713-
"column": 1,
26714-
"line": 2,
26715-
},
26716-
},
26717-
"type": "newline",
26718-
},
2671926705
Object {
2672026706
"buffer": false,
2672126707
"loc": Object {
2672226708
"end": Object {
2672326709
"column": 15,
26724-
"line": 2,
26710+
"line": 1,
2672526711
},
2672626712
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2672726713
"start": Object {
2672826714
"column": 1,
26729-
"line": 2,
26715+
"line": 1,
2673026716
},
2673126717
},
2673226718
"mustEscape": false,
@@ -26737,12 +26723,12 @@ Array [
2673726723
"loc": Object {
2673826724
"end": Object {
2673926725
"column": 1,
26740-
"line": 3,
26726+
"line": 2,
2674126727
},
2674226728
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2674326729
"start": Object {
2674426730
"column": 1,
26745-
"line": 3,
26731+
"line": 2,
2674626732
},
2674726733
},
2674826734
"type": "newline",
@@ -26751,12 +26737,12 @@ Array [
2675126737
"loc": Object {
2675226738
"end": Object {
2675326739
"column": 4,
26754-
"line": 3,
26740+
"line": 2,
2675526741
},
2675626742
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2675726743
"start": Object {
2675826744
"column": 1,
26759-
"line": 3,
26745+
"line": 2,
2676026746
},
2676126747
},
2676226748
"type": "tag",
@@ -26766,12 +26752,12 @@ Array [
2676626752
"loc": Object {
2676726753
"end": Object {
2676826754
"column": 3,
26769-
"line": 4,
26755+
"line": 3,
2677026756
},
2677126757
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2677226758
"start": Object {
2677326759
"column": 1,
26774-
"line": 4,
26760+
"line": 3,
2677526761
},
2677626762
},
2677726763
"type": "indent",
@@ -26781,12 +26767,12 @@ Array [
2678126767
"loc": Object {
2678226768
"end": Object {
2678326769
"column": 9,
26784-
"line": 4,
26770+
"line": 3,
2678526771
},
2678626772
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2678726773
"start": Object {
2678826774
"column": 5,
26789-
"line": 4,
26775+
"line": 3,
2679026776
},
2679126777
},
2679226778
"type": "text",
@@ -26796,12 +26782,12 @@ Array [
2679626782
"loc": Object {
2679726783
"end": Object {
2679826784
"column": 3,
26799-
"line": 5,
26785+
"line": 4,
2680026786
},
2680126787
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2680226788
"start": Object {
2680326789
"column": 1,
26804-
"line": 5,
26790+
"line": 4,
2680526791
},
2680626792
},
2680726793
"type": "newline",
@@ -26810,12 +26796,12 @@ Array [
2681026796
"loc": Object {
2681126797
"end": Object {
2681226798
"column": 13,
26813-
"line": 5,
26799+
"line": 4,
2681426800
},
2681526801
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2681626802
"start": Object {
2681726803
"column": 5,
26818-
"line": 5,
26804+
"line": 4,
2681926805
},
2682026806
},
2682126807
"type": "text",
@@ -26825,41 +26811,41 @@ Array [
2682526811
"loc": Object {
2682626812
"end": Object {
2682726813
"column": 3,
26828-
"line": 6,
26814+
"line": 5,
2682926815
},
2683026816
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2683126817
"start": Object {
2683226818
"column": 1,
26833-
"line": 6,
26819+
"line": 5,
2683426820
},
2683526821
},
2683626822
"type": "newline",
2683726823
},
2683826824
Object {
2683926825
"loc": Object {
2684026826
"end": Object {
26841-
"column": 9,
26842-
"line": 6,
26827+
"column": 13,
26828+
"line": 5,
2684326829
},
2684426830
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2684526831
"start": Object {
2684626832
"column": 5,
26847-
"line": 6,
26833+
"line": 5,
2684826834
},
2684926835
},
2685026836
"type": "text",
26851-
"val": "here",
26837+
"val": "!{here}",
2685226838
},
2685326839
Object {
2685426840
"loc": Object {
2685526841
"end": Object {
2685626842
"column": 3,
26857-
"line": 7,
26843+
"line": 6,
2685826844
},
2685926845
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2686026846
"start": Object {
2686126847
"column": 1,
26862-
"line": 7,
26848+
"line": 6,
2686326849
},
2686426850
},
2686526851
"type": "newline",
@@ -26868,12 +26854,12 @@ Array [
2686826854
"loc": Object {
2686926855
"end": Object {
2687026856
"column": 11,
26871-
"line": 7,
26857+
"line": 6,
2687226858
},
2687326859
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2687426860
"start": Object {
2687526861
"column": 5,
26876-
"line": 7,
26862+
"line": 6,
2687726863
},
2687826864
},
2687926865
"type": "text",
@@ -26884,12 +26870,12 @@ Array [
2688426870
"loc": Object {
2688526871
"end": Object {
2688626872
"column": 31,
26887-
"line": 7,
26873+
"line": 6,
2688826874
},
2688926875
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2689026876
"start": Object {
2689126877
"column": 11,
26892-
"line": 7,
26878+
"line": 6,
2689326879
},
2689426880
},
2689526881
"mustEscape": true,
@@ -26899,12 +26885,12 @@ Array [
2689926885
Object {
2690026886
"loc": Object {
2690126887
"end": Object {
26902-
"column": 31,
26888+
"column": 1,
2690326889
"line": 7,
2690426890
},
2690526891
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2690626892
"start": Object {
26907-
"column": 31,
26893+
"column": 1,
2690826894
"line": 7,
2690926895
},
2691026896
},
@@ -26913,12 +26899,12 @@ Array [
2691326899
Object {
2691426900
"loc": Object {
2691526901
"end": Object {
26916-
"column": 31,
26902+
"column": 1,
2691726903
"line": 7,
2691826904
},
2691926905
"filename": "<basedir>/packages/pug-lexer/test/cases/interpolation.escape.pug",
2692026906
"start": Object {
26921-
"column": 31,
26907+
"column": 1,
2692226908
"line": 7,
2692326909
},
2692426910
},

‎packages/pug-lexer/test/cases/interpolation.escape.pug

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
21
- var id = 42;
32
foo
43
| some
54
| \#{text}
6-
| here
7-
| My ID #{"is {" + id + "}"}
5+
| \!{here}
6+
| My ID #{"is {" + id + "}"}

0 commit comments

Comments
 (0)