From 688a1e523e83520693fbe3d18a085e056f427776 Mon Sep 17 00:00:00 2001
From: Brian Ng <bng412@gmail.com>
Date: Fri, 14 Jul 2017 09:16:31 -0500
Subject: [PATCH] Fix parsing a <!-- b in modules (#626)

---
 src/tokenizer/index.js                        |   3 +-
 .../xml-comment-in-module/expected.json       | 139 ++++++++++++++++++
 .../xml-comment-in-module/options.json        |   3 -
 .../modules/xml-comment-in-script/actual.js   |   1 +
 .../xml-comment-in-script/expected.json       | 104 +++++++++++++
 .../xml-comment-in-script/options.json        |   3 +
 6 files changed, 249 insertions(+), 4 deletions(-)
 create mode 100644 test/fixtures/es2015/modules/xml-comment-in-module/expected.json
 delete mode 100644 test/fixtures/es2015/modules/xml-comment-in-module/options.json
 create mode 100644 test/fixtures/es2015/modules/xml-comment-in-script/actual.js
 create mode 100644 test/fixtures/es2015/modules/xml-comment-in-script/expected.json
 create mode 100644 test/fixtures/es2015/modules/xml-comment-in-script/options.json

diff --git a/src/tokenizer/index.js b/src/tokenizer/index.js
index 73388d8485..de2e0decd7 100644
--- a/src/tokenizer/index.js
+++ b/src/tokenizer/index.js
@@ -434,6 +434,7 @@ export default class Tokenizer extends LocationParser {
     if (next === code) {
       if (
         next === 45 &&
+        !this.inModule &&
         this.input.charCodeAt(this.state.pos + 2) === 62 &&
         lineBreak.test(this.input.slice(this.state.lastTokEnd, this.state.pos))
       ) {
@@ -468,10 +469,10 @@ export default class Tokenizer extends LocationParser {
     if (
       next === 33 &&
       code === 60 &&
+      !this.inModule &&
       this.input.charCodeAt(this.state.pos + 2) === 45 &&
       this.input.charCodeAt(this.state.pos + 3) === 45
     ) {
-      if (this.inModule) this.unexpected();
       // `<!--`, an XML-style comment that should be interpreted as a line comment
       this.skipLineComment(4);
       this.skipSpace();
diff --git a/test/fixtures/es2015/modules/xml-comment-in-module/expected.json b/test/fixtures/es2015/modules/xml-comment-in-module/expected.json
new file mode 100644
index 0000000000..42b002119f
--- /dev/null
+++ b/test/fixtures/es2015/modules/xml-comment-in-module/expected.json
@@ -0,0 +1,139 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 11,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 11,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 11
+      }
+    },
+    "sourceType": "module",
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 11,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 11
+          }
+        },
+        "expression": {
+          "type": "BinaryExpression",
+          "start": 0,
+          "end": 11,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 11
+            }
+          },
+          "left": {
+            "type": "Identifier",
+            "start": 0,
+            "end": 3,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 0
+              },
+              "end": {
+                "line": 1,
+                "column": 3
+              },
+              "identifierName": "foo"
+            },
+            "name": "foo"
+          },
+          "operator": "<",
+          "right": {
+            "type": "UnaryExpression",
+            "start": 5,
+            "end": 11,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 5
+              },
+              "end": {
+                "line": 1,
+                "column": 11
+              }
+            },
+            "operator": "!",
+            "prefix": true,
+            "argument": {
+              "type": "UpdateExpression",
+              "start": 6,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 6
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                }
+              },
+              "operator": "--",
+              "prefix": true,
+              "argument": {
+                "type": "Identifier",
+                "start": 8,
+                "end": 11,
+                "loc": {
+                  "start": {
+                    "line": 1,
+                    "column": 8
+                  },
+                  "end": {
+                    "line": 1,
+                    "column": 11
+                  },
+                  "identifierName": "bar"
+                },
+                "name": "bar"
+              },
+              "extra": {
+                "parenthesizedArgument": false
+              }
+            },
+            "extra": {
+              "parenthesizedArgument": false
+            }
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/test/fixtures/es2015/modules/xml-comment-in-module/options.json b/test/fixtures/es2015/modules/xml-comment-in-module/options.json
deleted file mode 100644
index 27a7b64d71..0000000000
--- a/test/fixtures/es2015/modules/xml-comment-in-module/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "throws": "Unexpected token (1:4)"
-}
diff --git a/test/fixtures/es2015/modules/xml-comment-in-script/actual.js b/test/fixtures/es2015/modules/xml-comment-in-script/actual.js
new file mode 100644
index 0000000000..81d1a714b9
--- /dev/null
+++ b/test/fixtures/es2015/modules/xml-comment-in-script/actual.js
@@ -0,0 +1 @@
+foo <!--bar
diff --git a/test/fixtures/es2015/modules/xml-comment-in-script/expected.json b/test/fixtures/es2015/modules/xml-comment-in-script/expected.json
new file mode 100644
index 0000000000..58dd94ffda
--- /dev/null
+++ b/test/fixtures/es2015/modules/xml-comment-in-script/expected.json
@@ -0,0 +1,104 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 11,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 11
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 11,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 11
+      }
+    },
+    "sourceType": "script",
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start": 0,
+        "end": 3,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 3
+          }
+        },
+        "expression": {
+          "type": "Identifier",
+          "start": 0,
+          "end": 3,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 0
+            },
+            "end": {
+              "line": 1,
+              "column": 3
+            },
+            "identifierName": "foo"
+          },
+          "name": "foo",
+          "leadingComments": null,
+          "trailingComments": null
+        },
+        "trailingComments": [
+          {
+            "type": "CommentLine",
+            "value": "bar",
+            "start": 4,
+            "end": 11,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 4
+              },
+              "end": {
+                "line": 1,
+                "column": 11
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  },
+  "comments": [
+    {
+      "type": "CommentLine",
+      "value": "bar",
+      "start": 4,
+      "end": 11,
+      "loc": {
+        "start": {
+          "line": 1,
+          "column": 4
+        },
+        "end": {
+          "line": 1,
+          "column": 11
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/fixtures/es2015/modules/xml-comment-in-script/options.json b/test/fixtures/es2015/modules/xml-comment-in-script/options.json
new file mode 100644
index 0000000000..b412ffe671
--- /dev/null
+++ b/test/fixtures/es2015/modules/xml-comment-in-script/options.json
@@ -0,0 +1,3 @@
+{
+  "sourceType": "script"
+}