Skip to content

Commit 5816825

Browse files
GlyphackGlyphack
committed
fix: Do not count new line in ast offset
1 parent 144534f commit 5816825

9 files changed

+62
-63
lines changed

‎parser/src/parser/parser.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,6 @@ impl<'a> Parser<'a> {
11681168
let stmt = self.parse_statement_list()?;
11691169
Ok(stmt)
11701170
};
1171-
self.bump(Kind::NewLine);
11721171
stmts
11731172
}
11741173

‎parser/test_data/output/enderpy_python_parser__parser__parser__tests__class.snap

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
source: parser/src/parser/parser.rs
3-
description: "class a: pass\n\nclass a():\n pass\n\nclass a(b, c): pass\n\nclass a(b, *c, **d): pass\n\nclass a(b,\nc,\nd): pass\n\n@decor\nclass a: pass\n\nclass a[T]: pass\n\nclass a[T, U]: pass\n\nclass a[T: U]: pass\n\nclass a[T: U, V: W]: pass\n\nclass a[*T]: pass\n\nclass a[T, *U]: pass\n\nclass a[T: U, *V]: pass\n\nclass a[T: U, V: W, *X]: pass\n\nclass a[**T]: pass\n\nclass a[T, **U]: pass\n\nclass a[T: U, **V]: pass\n\nclass a[T: U, V: W, **X]: pass\n\nclass a[T, *U, **V]: pass\n\nclass a[T: U, *V, **W]: pass\n"
3+
description: "test file: test_data/inputs/class.py\nclass a: pass\n\nclass a():\n pass\n\nclass a(b, c): pass\n\nclass a(b, *c, **d): pass\n\nclass a(b,\nc,\nd): pass\n\n@decor\nclass a: pass\n\nclass a[T]: pass\n\nclass a[T, U]: pass\n\nclass a[T: U]: pass\n\nclass a[T: U, V: W]: pass\n\nclass a[*T]: pass\n\nclass a[T, *U]: pass\n\nclass a[T: U, *V]: pass\n\nclass a[T: U, V: W, *X]: pass\n\nclass a[**T]: pass\n\nclass a[T, **U]: pass\n\nclass a[T: U, **V]: pass\n\nclass a[T: U, V: W, **X]: pass\n\nclass a[T, *U, **V]: pass\n\nclass a[T: U, *V, **W]: pass\n"
44
---
55
Module {
66
node: Node {
@@ -12,7 +12,7 @@ Module {
1212
ClassDef {
1313
node: Node {
1414
start: 0,
15-
end: 14,
15+
end: 13,
1616
},
1717
name: "a",
1818
bases: [],
@@ -58,7 +58,7 @@ Module {
5858
ClassDef {
5959
node: Node {
6060
start: 36,
61-
end: 56,
61+
end: 55,
6262
},
6363
name: "a",
6464
bases: [
@@ -100,7 +100,7 @@ Module {
100100
ClassDef {
101101
node: Node {
102102
start: 57,
103-
end: 83,
103+
end: 82,
104104
},
105105
name: "a",
106106
bases: [
@@ -167,7 +167,7 @@ Module {
167167
ClassDef {
168168
node: Node {
169169
start: 84,
170-
end: 107,
170+
end: 106,
171171
},
172172
name: "a",
173173
bases: [
@@ -218,7 +218,7 @@ Module {
218218
ClassDef {
219219
node: Node {
220220
start: 108,
221-
end: 129,
221+
end: 128,
222222
},
223223
name: "a",
224224
bases: [],
@@ -251,7 +251,7 @@ Module {
251251
ClassDef {
252252
node: Node {
253253
start: 130,
254-
end: 147,
254+
end: 146,
255255
},
256256
name: "a",
257257
bases: [],
@@ -285,7 +285,7 @@ Module {
285285
ClassDef {
286286
node: Node {
287287
start: 148,
288-
end: 168,
288+
end: 167,
289289
},
290290
name: "a",
291291
bases: [],
@@ -329,7 +329,7 @@ Module {
329329
ClassDef {
330330
node: Node {
331331
start: 169,
332-
end: 189,
332+
end: 188,
333333
},
334334
name: "a",
335335
bases: [],
@@ -373,7 +373,7 @@ Module {
373373
ClassDef {
374374
node: Node {
375375
start: 190,
376-
end: 216,
376+
end: 215,
377377
},
378378
name: "a",
379379
bases: [],
@@ -437,7 +437,7 @@ Module {
437437
ClassDef {
438438
node: Node {
439439
start: 217,
440-
end: 235,
440+
end: 234,
441441
},
442442
name: "a",
443443
bases: [],
@@ -470,7 +470,7 @@ Module {
470470
ClassDef {
471471
node: Node {
472472
start: 236,
473-
end: 257,
473+
end: 256,
474474
},
475475
name: "a",
476476
bases: [],
@@ -513,7 +513,7 @@ Module {
513513
ClassDef {
514514
node: Node {
515515
start: 258,
516-
end: 282,
516+
end: 281,
517517
},
518518
name: "a",
519519
bases: [],
@@ -566,7 +566,7 @@ Module {
566566
ClassDef {
567567
node: Node {
568568
start: 283,
569-
end: 313,
569+
end: 312,
570570
},
571571
name: "a",
572572
bases: [],
@@ -639,7 +639,7 @@ Module {
639639
ClassDef {
640640
node: Node {
641641
start: 314,
642-
end: 333,
642+
end: 332,
643643
},
644644
name: "a",
645645
bases: [],
@@ -672,7 +672,7 @@ Module {
672672
ClassDef {
673673
node: Node {
674674
start: 334,
675-
end: 356,
675+
end: 355,
676676
},
677677
name: "a",
678678
bases: [],
@@ -715,7 +715,7 @@ Module {
715715
ClassDef {
716716
node: Node {
717717
start: 357,
718-
end: 382,
718+
end: 381,
719719
},
720720
name: "a",
721721
bases: [],
@@ -768,7 +768,7 @@ Module {
768768
ClassDef {
769769
node: Node {
770770
start: 383,
771-
end: 414,
771+
end: 413,
772772
},
773773
name: "a",
774774
bases: [],
@@ -841,7 +841,7 @@ Module {
841841
ClassDef {
842842
node: Node {
843843
start: 415,
844-
end: 441,
844+
end: 440,
845845
},
846846
name: "a",
847847
bases: [],
@@ -893,7 +893,7 @@ Module {
893893
ClassDef {
894894
node: Node {
895895
start: 442,
896-
end: 471,
896+
end: 470,
897897
},
898898
name: "a",
899899
bases: [],

‎parser/test_data/output/enderpy_python_parser__parser__parser__tests__comments.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
source: parser/src/parser/parser.rs
3-
description: "# a\n# a\n\n# a\n# b\ndef a(): ... # a\n\ndef b():\n # a\n ... # a\n\n# this is a comment only line\n"
3+
description: "test file: test_data/inputs/comments.py\n# a\n# a\n\n# a\n# b\ndef a(): ... # a\n\ndef b():\n # a\n ... # a\n\n# this is a comment only line\n"
44
---
55
Module {
66
node: Node {
@@ -12,7 +12,7 @@ Module {
1212
FunctionDef {
1313
node: Node {
1414
start: 17,
15-
end: 34,
15+
end: 33,
1616
},
1717
name: "a",
1818
args: Arguments {
@@ -51,7 +51,7 @@ Module {
5151
FunctionDef {
5252
node: Node {
5353
start: 35,
54-
end: 95,
54+
end: 94,
5555
},
5656
name: "b",
5757
args: Arguments {

0 commit comments

Comments
 (0)