Skip to content
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

Jump to bottom

Fixes #8865 #8866

Merged
merged 2 commits into from Oct 12, 2018
Merged

Fixes #8865 #8866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44368ef
increment curLine along with pos for more accurate location tracking
byronluk Oct 12, 2018
03f70c1
updated tests for json-strings
byronluk Oct 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/babel-parser/src/tokenizer/index.js
View file
Open in desktop
Expand Up @@ -1087,6 +1087,7 @@ export default class Tokenizer extends LocationParser {
(ch === charCodes.lineSeparator || ch === charCodes.paragraphSeparator)
) {
++this.state.pos;
++this.state.curLine;
} else if (isNewLine(ch)) {
this.raise(this.state.start, "Unterminated string constant");
} else {
Expand Down
16 changes: 8 additions & 8 deletions ...babel-parser/test/fixtures/experimental/json-strings/directive-line-separator/output.json
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 82
}
},
Expand All @@ -22,7 +22,7 @@
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 82
}
},
Expand All @@ -40,7 +40,7 @@
"column": 0
},
"end": {
"line": 1,
"line": 2,
"column": 15
}
},
Expand All @@ -54,7 +54,7 @@
"column": 0
},
"end": {
"line": 1,
"line": 2,
"column": 14
}
},
Expand All @@ -72,11 +72,11 @@
"end": 98,
"loc": {
"start": {
"line": 2,
"line": 3,
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 82
}
}
Expand All @@ -93,11 +93,11 @@
"end": 98,
"loc": {
"start": {
"line": 2,
"line": 3,
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 82
}
}
Expand Down
16 changes: 8 additions & 8 deletions ...-parser/test/fixtures/experimental/json-strings/directive-paragraph-separator/output.json
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 87
}
},
Expand All @@ -22,7 +22,7 @@
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 87
}
},
Expand All @@ -40,7 +40,7 @@
"column": 0
},
"end": {
"line": 1,
"line": 2,
"column": 15
}
},
Expand All @@ -54,7 +54,7 @@
"column": 0
},
"end": {
"line": 1,
"line": 2,
"column": 14
}
},
Expand All @@ -72,11 +72,11 @@
"end": 103,
"loc": {
"start": {
"line": 2,
"line": 3,
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 87
}
}
Expand All @@ -93,11 +93,11 @@
"end": 103,
"loc": {
"start": {
"line": 2,
"line": 3,
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 87
}
}
Expand Down
16 changes: 8 additions & 8 deletions ...es/babel-parser/test/fixtures/experimental/json-strings/string-line-separator/output.json
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 83
}
},
Expand All @@ -22,7 +22,7 @@
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 83
}
},
Expand All @@ -39,7 +39,7 @@
"column": 0
},
"end": {
"line": 1,
"line": 2,
"column": 17
}
},
Expand All @@ -53,7 +53,7 @@
"column": 1
},
"end": {
"line": 1,
"line": 2,
"column": 15
}
},
Expand All @@ -73,11 +73,11 @@
"end": 101,
"loc": {
"start": {
"line": 2,
"line": 3,
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 83
}
}
Expand All @@ -95,11 +95,11 @@
"end": 101,
"loc": {
"start": {
"line": 2,
"line": 3,
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 83
}
}
Expand Down
16 changes: 8 additions & 8 deletions ...bel-parser/test/fixtures/experimental/json-strings/string-paragraph-separator/output.json
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 88
}
},
Expand All @@ -22,7 +22,7 @@
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 88
}
},
Expand All @@ -39,7 +39,7 @@
"column": 0
},
"end": {
"line": 1,
"line": 2,
"column": 17
}
},
Expand All @@ -53,7 +53,7 @@
"column": 1
},
"end": {
"line": 1,
"line": 2,
"column": 15
}
},
Expand All @@ -73,11 +73,11 @@
"end": 106,
"loc": {
"start": {
"line": 2,
"line": 3,
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 88
}
}
Expand All @@ -95,11 +95,11 @@
"end": 106,
"loc": {
"start": {
"line": 2,
"line": 3,
"column": 0
},
"end": {
"line": 2,
"line": 3,
"column": 88
}
}
Expand Down