Skip to content

Commit 595b9ae

Browse files
committed
🐛 fix wrong locations for filters syntax with line breaks
1 parent a6135f8 commit 595b9ae

File tree

8 files changed

+789
-12
lines changed

8 files changed

+789
-12
lines changed

src/script/index.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -461,16 +461,15 @@ function parseFilter(
461461
range: [callee.range[0], callee.range[1] - 2],
462462
loc: {
463463
start: callee.loc.start,
464-
end: {
465-
line: callee.loc.end.line,
466-
column: callee.loc.end.column - 2,
467-
},
464+
end: locationCalculator.getLocation(
465+
callee.range[1] - callee.range[0] - 1,
466+
),
468467
},
469468
name: String(callee.value),
470469
}
471470
tokens.push({
472471
type: "Identifier",
473-
value: calleeCode,
472+
value: calleeCode.trim(),
474473
range: expression.callee.range,
475474
loc: expression.callee.loc,
476475
})

test/fixtures/ast/filters-2/ast.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
},
556556
{
557557
"type": "Identifier",
558-
"value": " f1 ",
558+
"value": "f1",
559559
"range": [
560560
31,
561561
33
@@ -591,7 +591,7 @@
591591
},
592592
{
593593
"type": "Identifier",
594-
"value": " f2",
594+
"value": "f2",
595595
"range": [
596596
36,
597597
38
@@ -667,7 +667,7 @@
667667
},
668668
{
669669
"type": "Identifier",
670-
"value": " f3",
670+
"value": "f3",
671671
"range": [
672672
43,
673673
45

test/fixtures/ast/filters-3/ast.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@
617617
},
618618
{
619619
"type": "Identifier",
620-
"value": " f1 ",
620+
"value": "f1",
621621
"range": [
622622
35,
623623
37
@@ -653,7 +653,7 @@
653653
},
654654
{
655655
"type": "Identifier",
656-
"value": " f2",
656+
"value": "f2",
657657
"range": [
658658
40,
659659
42
@@ -729,7 +729,7 @@
729729
},
730730
{
731731
"type": "Identifier",
732-
"value": " f3",
732+
"value": "f3",
733733
"range": [
734734
47,
735735
49

0 commit comments

Comments
 (0)