Skip to content

feat!: Program range span entire source text #677

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

feat!: Program range span entire source text #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ae24b3
feat!: Program range span entire source text
Pixel998 Sep 15, 2025
a15a06d
fix failing tests
Pixel998 Sep 16, 2025
6d58ab2
Merge branch 'main' into Program-range-cover-whole-program
Pixel998 Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions packages/espree/lib/espree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,35 +181,6 @@ export default () => Parser => {
program.tokens = extra.tokens;
}

/*
* Adjust opening and closing position of program to match Esprima.
* Acorn always starts programs at range 0 whereas Esprima starts at the
* first AST node's start (the only real difference is when there's leading
* whitespace or leading comments). Acorn also counts trailing whitespace
* as part of the program whereas Esprima only counts up to the last token.
*/
if (program.body.length) {
const [firstNode] = program.body;

if (program.range) {
program.range[0] = firstNode.range[0];
}
if (program.loc) {
program.loc.start = firstNode.loc.start;
}
program.start = firstNode.start;
}
if (extra.lastToken) {
if (program.range) {
program.range[1] = extra.lastToken.range[1];
}
if (program.loc) {
program.loc.end = extra.lastToken.loc.end;
}
program.end = extra.lastToken.end;
}


/*
* https://github.com/eslint/espree/issues/349
* Ensure that template elements have correct range information.
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-features/globalReturn/return-identifier.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 12
"line": 2,
"column": 0
}
},
"range": [
0,
12
13
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-features/globalReturn/return-no-arg.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 7
"line": 2,
"column": 0
}
},
"range": [
0,
7
8
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-features/globalReturn/return-true.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 12
"line": 2,
"column": 0
}
},
"range": [
0,
12
13
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-features/jsx/embedded-tags.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 61
"line": 2,
"column": 0
}
},
"range": [
0,
61
62
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-features/jsx/member-expression.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column":0
},
"end":{
"line":1,
"column":12
"line":2,
"column":0
}
},
"range":[
0,
12
13
],
"body":[
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-features/jsx/namespaced-name.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column":0
},
"end":{
"line":1,
"column":12
"line":2,
"column":0
}
},
"range":[
0,
12
13
],
"body":[
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-features/jsx/template-strings-in-jsx-complex.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 14,
"column": 29
"line": 15,
"column": 0
}
},
"range": [
0,
292
293
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-features/jsx/template-strings-in-jsx-multi.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 19
"line": 2,
"column": 0
}
},
"range": [
0,
19
20
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-features/jsx/template-strings-in-jsx.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 22
"line": 2,
"column": 0
}
},
"range": [
0,
22
23
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-version/10/json-superset/valid-2028.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 2,
"column": 1
"line": 3,
"column": 0
}
},
"range": [
0,
11
12
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-version/10/json-superset/valid-2029.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 2,
"column": 1
"line": 3,
"column": 0
}
},
"range": [
0,
11
12
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-version/10/optional-catch-binding/valid-01.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 15
"line": 2,
"column": 0
}
},
"range": [
0,
15
16
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-version/10/optional-catch-binding/valid-02.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 5,
"column": 1
"line": 6,
"column": 0
}
},
"range": [
0,
37
38
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-version/11/bigint/binary.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 7
"line": 2,
"column": 0
}
},
"range": [
0,
7
8
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-version/11/bigint/decimal.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 2
"line": 2,
"column": 0
}
},
"range": [
0,
2
3
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-version/11/bigint/hex.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 5
"line": 2,
"column": 0
}
},
"range": [
0,
5
6
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-version/11/bigint/octal.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 6
"line": 2,
"column": 0
}
},
"range": [
0,
6
7
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-version/11/dynamic-import/basic.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 3,
"column": 1
"line": 4,
"column": 0
}
},
"range": [
0,
62
63
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-version/11/dynamic-import/first-of-statement.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 14
"line": 2,
"column": 0
}
},
"range": [
0,
14
15
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-version/11/dynamic-import/new-import.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 20
"line": 2,
"column": 0
}
},
"range": [
0,
20
21
],
"body": [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/espree/tests/fixtures/ecma-version/11/dynamic-import/with-assign.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ export default {
"column": 0
},
"end": {
"line": 1,
"column": 25
"line": 2,
"column": 0
}
},
"range": [
0,
25
26
],
"body": [
{
Expand Down
Loading
Loading