Fixes #8865 (#8866)

babel · Oct 12, 2018 · 9295675 · 9295675
1 parent 5080059
commit 9295675
Show file tree

Hide file tree

Showing 6 changed files with 1,372 additions and 32 deletions.
diff --git a/packages/babel-parser/src/tokenizer/index.js b/packages/babel-parser/src/tokenizer/index.js
@@ -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 {

diff --git a/...babel-parser/test/fixtures/experimental/json-strings/directive-line-separator/output.json b/...babel-parser/test/fixtures/experimental/json-strings/directive-line-separator/output.json
@@ -8,7 +8,7 @@
       "column": 0
     },
     "end": {
-      "line": 2,
+      "line": 3,
       "column": 82
     }
   },
@@ -22,7 +22,7 @@
         "column": 0
       },
       "end": {
-        "line": 2,
+        "line": 3,
         "column": 82
       }
     },
@@ -40,7 +40,7 @@
             "column": 0
           },
           "end": {
-            "line": 1,
+            "line": 2,
             "column": 15
           }
         },
@@ -54,7 +54,7 @@
               "column": 0
             },
             "end": {
-              "line": 1,
+              "line": 2,
               "column": 14
             }
           },
@@ -72,11 +72,11 @@
             "end": 98,
             "loc": {
               "start": {
-                "line": 2,
+                "line": 3,
                 "column": 0
               },
               "end": {
-                "line": 2,
+                "line": 3,
                 "column": 82
               }
             }
@@ -93,11 +93,11 @@
       "end": 98,
       "loc": {
         "start": {
-          "line": 2,
+          "line": 3,
           "column": 0
         },
         "end": {
-          "line": 2,
+          "line": 3,
           "column": 82
         }
       }

diff --git a/...-parser/test/fixtures/experimental/json-strings/directive-paragraph-separator/output.json b/...-parser/test/fixtures/experimental/json-strings/directive-paragraph-separator/output.json
@@ -8,7 +8,7 @@
       "column": 0
     },
     "end": {
-      "line": 2,
+      "line": 3,
       "column": 87
     }
   },
@@ -22,7 +22,7 @@
         "column": 0
       },
       "end": {
-        "line": 2,
+        "line": 3,
         "column": 87
       }
     },
@@ -40,7 +40,7 @@
             "column": 0
           },
           "end": {
-            "line": 1,
+            "line": 2,
             "column": 15
           }
         },
@@ -54,7 +54,7 @@
               "column": 0
             },
             "end": {
-              "line": 1,
+              "line": 2,
               "column": 14
             }
           },
@@ -72,11 +72,11 @@
             "end": 103,
             "loc": {
               "start": {
-                "line": 2,
+                "line": 3,
                 "column": 0
               },
               "end": {
-                "line": 2,
+                "line": 3,
                 "column": 87
               }
             }
@@ -93,11 +93,11 @@
       "end": 103,
       "loc": {
         "start": {
-          "line": 2,
+          "line": 3,
           "column": 0
         },
         "end": {
-          "line": 2,
+          "line": 3,
           "column": 87
         }
       }

diff --git a/...es/babel-parser/test/fixtures/experimental/json-strings/string-line-separator/output.json b/...es/babel-parser/test/fixtures/experimental/json-strings/string-line-separator/output.json
@@ -8,7 +8,7 @@
       "column": 0
     },
     "end": {
-      "line": 2,
+      "line": 3,
       "column": 83
     }
   },
@@ -22,7 +22,7 @@
         "column": 0
       },
       "end": {
-        "line": 2,
+        "line": 3,
         "column": 83
       }
     },
@@ -39,7 +39,7 @@
             "column": 0
           },
           "end": {
-            "line": 1,
+            "line": 2,
             "column": 17
           }
         },
@@ -53,7 +53,7 @@
               "column": 1
             },
             "end": {
-              "line": 1,
+              "line": 2,
               "column": 15
             }
           },
@@ -73,11 +73,11 @@
             "end": 101,
             "loc": {
               "start": {
-                "line": 2,
+                "line": 3,
                 "column": 0
               },
               "end": {
-                "line": 2,
+                "line": 3,
                 "column": 83
               }
             }
@@ -95,11 +95,11 @@
       "end": 101,
       "loc": {
         "start": {
-          "line": 2,
+          "line": 3,
           "column": 0
         },
         "end": {
-          "line": 2,
+          "line": 3,
           "column": 83
         }
       }

diff --git a/...bel-parser/test/fixtures/experimental/json-strings/string-paragraph-separator/output.json b/...bel-parser/test/fixtures/experimental/json-strings/string-paragraph-separator/output.json
@@ -8,7 +8,7 @@
       "column": 0
     },
     "end": {
-      "line": 2,
+      "line": 3,
       "column": 88
     }
   },
@@ -22,7 +22,7 @@
         "column": 0
       },
       "end": {
-        "line": 2,
+        "line": 3,
         "column": 88
       }
     },
@@ -39,7 +39,7 @@
             "column": 0
           },
           "end": {
-            "line": 1,
+            "line": 2,
             "column": 17
           }
         },
@@ -53,7 +53,7 @@
               "column": 1
             },
             "end": {
-              "line": 1,
+              "line": 2,
               "column": 15
             }
           },
@@ -73,11 +73,11 @@
             "end": 106,
             "loc": {
               "start": {
-                "line": 2,
+                "line": 3,
                 "column": 0
               },
               "end": {
-                "line": 2,
+                "line": 3,
                 "column": 88
               }
             }
@@ -95,11 +95,11 @@
       "end": 106,
       "loc": {
         "start": {
-          "line": 2,
+          "line": 3,
           "column": 0
         },
         "end": {
-          "line": 2,
+          "line": 3,
           "column": 88
         }
       }