Skip to content

Commit 68bbb74

Browse files
authored
feat!: Program range span entire source text (#677)
* feat!: Program range span entire source text * fix failing tests
1 parent 9c84ecb commit 68bbb74

File tree

242 files changed

+727
-756
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+727
-756
lines changed

packages/espree/lib/espree.js

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -181,35 +181,6 @@ export default () => Parser => {
181181
program.tokens = extra.tokens;
182182
}
183183

184-
/*
185-
* Adjust opening and closing position of program to match Esprima.
186-
* Acorn always starts programs at range 0 whereas Esprima starts at the
187-
* first AST node's start (the only real difference is when there's leading
188-
* whitespace or leading comments). Acorn also counts trailing whitespace
189-
* as part of the program whereas Esprima only counts up to the last token.
190-
*/
191-
if (program.body.length) {
192-
const [firstNode] = program.body;
193-
194-
if (program.range) {
195-
program.range[0] = firstNode.range[0];
196-
}
197-
if (program.loc) {
198-
program.loc.start = firstNode.loc.start;
199-
}
200-
program.start = firstNode.start;
201-
}
202-
if (extra.lastToken) {
203-
if (program.range) {
204-
program.range[1] = extra.lastToken.range[1];
205-
}
206-
if (program.loc) {
207-
program.loc.end = extra.lastToken.loc.end;
208-
}
209-
program.end = extra.lastToken.end;
210-
}
211-
212-
213184
/*
214185
* https://github.com/eslint/espree/issues/349
215186
* Ensure that template elements have correct range information.

packages/espree/tests/fixtures/ecma-features/globalReturn/return-identifier.result.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ export default {
66
"column": 0
77
},
88
"end": {
9-
"line": 1,
10-
"column": 12
9+
"line": 2,
10+
"column": 0
1111
}
1212
},
1313
"range": [
1414
0,
15-
12
15+
13
1616
],
1717
"body": [
1818
{

packages/espree/tests/fixtures/ecma-features/globalReturn/return-no-arg.result.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ export default {
66
"column": 0
77
},
88
"end": {
9-
"line": 1,
10-
"column": 7
9+
"line": 2,
10+
"column": 0
1111
}
1212
},
1313
"range": [
1414
0,
15-
7
15+
8
1616
],
1717
"body": [
1818
{

packages/espree/tests/fixtures/ecma-features/globalReturn/return-true.result.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ export default {
66
"column": 0
77
},
88
"end": {
9-
"line": 1,
10-
"column": 12
9+
"line": 2,
10+
"column": 0
1111
}
1212
},
1313
"range": [
1414
0,
15-
12
15+
13
1616
],
1717
"body": [
1818
{

packages/espree/tests/fixtures/ecma-features/jsx/embedded-tags.result.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ export default {
66
"column": 0
77
},
88
"end": {
9-
"line": 1,
10-
"column": 61
9+
"line": 2,
10+
"column": 0
1111
}
1212
},
1313
"range": [
1414
0,
15-
61
15+
62
1616
],
1717
"body": [
1818
{

packages/espree/tests/fixtures/ecma-features/jsx/member-expression.result.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ export default {
66
"column":0
77
},
88
"end":{
9-
"line":1,
10-
"column":12
9+
"line":2,
10+
"column":0
1111
}
1212
},
1313
"range":[
1414
0,
15-
12
15+
13
1616
],
1717
"body":[
1818
{

packages/espree/tests/fixtures/ecma-features/jsx/namespaced-name.result.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ export default {
66
"column":0
77
},
88
"end":{
9-
"line":1,
10-
"column":12
9+
"line":2,
10+
"column":0
1111
}
1212
},
1313
"range":[
1414
0,
15-
12
15+
13
1616
],
1717
"body":[
1818
{

packages/espree/tests/fixtures/ecma-features/jsx/template-strings-in-jsx-complex.result.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ export default {
66
"column": 0
77
},
88
"end": {
9-
"line": 14,
10-
"column": 29
9+
"line": 15,
10+
"column": 0
1111
}
1212
},
1313
"range": [
1414
0,
15-
292
15+
293
1616
],
1717
"body": [
1818
{

packages/espree/tests/fixtures/ecma-features/jsx/template-strings-in-jsx-multi.result.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ export default {
66
"column": 0
77
},
88
"end": {
9-
"line": 1,
10-
"column": 19
9+
"line": 2,
10+
"column": 0
1111
}
1212
},
1313
"range": [
1414
0,
15-
19
15+
20
1616
],
1717
"body": [
1818
{

packages/espree/tests/fixtures/ecma-features/jsx/template-strings-in-jsx.result.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ export default {
66
"column": 0
77
},
88
"end": {
9-
"line": 1,
10-
"column": 22
9+
"line": 2,
10+
"column": 0
1111
}
1212
},
1313
"range": [
1414
0,
15-
22
15+
23
1616
],
1717
"body": [
1818
{

0 commit comments

Comments
 (0)