Skip to content

Commit

Permalink
fix: Do not count new line in ast offset
Browse files Browse the repository at this point in the history
  • Loading branch information
@Glyphack
Glyphack committed Aug 5, 2024
1 parent 144534f commit 5816825
Show file tree
Hide file tree
Showing 9 changed files with 62 additions and 63 deletions.
1 change: 0 additions & 1 deletion parser/src/parser/parser.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,6 @@ impl<'a> Parser<'a> {
let stmt = self.parse_statement_list()?;
Ok(stmt)
};
self.bump(Kind::NewLine);
stmts
}

Expand Down
40 changes: 20 additions & 20 deletions parser/test_data/output/enderpy_python_parser__parser__parser__tests__class.snap
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
source: parser/src/parser/parser.rs
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"
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"
---
Module {
node: Node {
Expand All @@ -12,7 +12,7 @@ Module {
ClassDef {
node: Node {
start: 0,
end: 14,
end: 13,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -58,7 +58,7 @@ Module {
ClassDef {
node: Node {
start: 36,
end: 56,
end: 55,
},
name: "a",
bases: [
Expand Down Expand Up @@ -100,7 +100,7 @@ Module {
ClassDef {
node: Node {
start: 57,
end: 83,
end: 82,
},
name: "a",
bases: [
Expand Down Expand Up @@ -167,7 +167,7 @@ Module {
ClassDef {
node: Node {
start: 84,
end: 107,
end: 106,
},
name: "a",
bases: [
Expand Down Expand Up @@ -218,7 +218,7 @@ Module {
ClassDef {
node: Node {
start: 108,
end: 129,
end: 128,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -251,7 +251,7 @@ Module {
ClassDef {
node: Node {
start: 130,
end: 147,
end: 146,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -285,7 +285,7 @@ Module {
ClassDef {
node: Node {
start: 148,
end: 168,
end: 167,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -329,7 +329,7 @@ Module {
ClassDef {
node: Node {
start: 169,
end: 189,
end: 188,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -373,7 +373,7 @@ Module {
ClassDef {
node: Node {
start: 190,
end: 216,
end: 215,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -437,7 +437,7 @@ Module {
ClassDef {
node: Node {
start: 217,
end: 235,
end: 234,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -470,7 +470,7 @@ Module {
ClassDef {
node: Node {
start: 236,
end: 257,
end: 256,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -513,7 +513,7 @@ Module {
ClassDef {
node: Node {
start: 258,
end: 282,
end: 281,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -566,7 +566,7 @@ Module {
ClassDef {
node: Node {
start: 283,
end: 313,
end: 312,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -639,7 +639,7 @@ Module {
ClassDef {
node: Node {
start: 314,
end: 333,
end: 332,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -672,7 +672,7 @@ Module {
ClassDef {
node: Node {
start: 334,
end: 356,
end: 355,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -715,7 +715,7 @@ Module {
ClassDef {
node: Node {
start: 357,
end: 382,
end: 381,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -768,7 +768,7 @@ Module {
ClassDef {
node: Node {
start: 383,
end: 414,
end: 413,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -841,7 +841,7 @@ Module {
ClassDef {
node: Node {
start: 415,
end: 441,
end: 440,
},
name: "a",
bases: [],
Expand Down Expand Up @@ -893,7 +893,7 @@ Module {
ClassDef {
node: Node {
start: 442,
end: 471,
end: 470,
},
name: "a",
bases: [],
Expand Down
6 changes: 3 additions & 3 deletions parser/test_data/output/enderpy_python_parser__parser__parser__tests__comments.snap
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
source: parser/src/parser/parser.rs
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"
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"
---
Module {
node: Node {
Expand All @@ -12,7 +12,7 @@ Module {
FunctionDef {
node: Node {
start: 17,
end: 34,
end: 33,
},
name: "a",
args: Arguments {
Expand Down Expand Up @@ -51,7 +51,7 @@ Module {
FunctionDef {
node: Node {
start: 35,
end: 95,
end: 94,
},
name: "b",
args: Arguments {
Expand Down
Loading

0 comments on commit 5816825

Please sign in to comment.