bugfix: ignore comment after source of import

mistlog · Mar 14, 2021 · f30f883 · f30f883
1 parent 90cecae
commit f30f883
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 10 deletions.
diff --git a/src/parser/basic/string.tsx b/src/parser/basic/string.tsx
@@ -3,7 +3,7 @@ import { _ } from "../common";
 
 export function SourceCharacter() {
     return (
-        <any/>
+        <any />
     )
 }
 
@@ -13,16 +13,14 @@ export function SourceCharacter() {
        encoding-prefixoptR raw-string
  */
 export function String() {
-    const action = ({ globalFunction }) => {
-        const trimmed = globalFunction.text().trim();
-        const value = trimmed.slice(1, trimmed.length - 1);
-        return value;
+    const action = ({ chars }) => {
+        return chars.join("");
     }
 
     return (
         <pattern action={action}>
             <_ /><text>"</text><_ />
-            <SCharSequence />
+            <SCharSequence label="chars" />
             <_ /><text>"</text><_ />
         </pattern>
     )

diff --git a/test/__snapshots__/generator.test.ts.snap b/test/__snapshots__/generator.test.ts.snap
@@ -164,7 +164,7 @@ exports[`ts-type TypeArrowFunctionExpression: with params 1`] = `"T extends stri
 
 exports[`ts-type UnionType 1`] = `"(\\"0\\" | \\"1\\")"`;
 
-exports[`ts-type UnionType: special char 1`] = `"(\\" \\" | \\"\\\\n\\" | \\"\\\\t\\")"`;
+exports[`ts-type UnionType: special char 1`] = `"(\\"\\" | \\"\\\\n\\" | \\"\\\\t\\")"`;
 
 exports[`type file TypeFile 1`] = `
 "type temp = string;

diff --git a/test/assets/ast/ImportDeclaration-3.json b/test/assets/ast/ImportDeclaration-3.json
@@ -0,0 +1,20 @@
+{
+    "kind": "ImportDeclaration",
+    "source": "./temp",
+    "specifiers": [
+        {
+            "kind": "ImportSpecifier",
+            "imported": {
+                "kind": "Identifier",
+                "name": "Temp"
+            }
+        },
+        {
+            "kind": "ImportSpecifier",
+            "imported": {
+                "kind": "Identifier",
+                "name": "Temp2"
+            }
+        }
+    ]
+}
diff --git a/test/assets/ast/UnionType-SpecialChar.json b/test/assets/ast/UnionType-SpecialChar.json
@@ -3,7 +3,7 @@
     "types": [
         {
             "kind": "StringTypeLiteral",
-            "value": " "
+            "value": ""
         },
         {
             "kind": "StringTypeLiteral",

diff --git a/test/assets/ts-type/UnionType-SpecialChar b/test/assets/ts-type/UnionType-SpecialChar
@@ -1 +1 @@
-(" " | "\n" | "\t")
+("" | "\n" | "\t")
diff --git a/test/parser.test.tsx b/test/parser.test.tsx
@@ -173,6 +173,8 @@ test("ImportDeclaration: 2", () => {
     const parser = ReactPeg.render(<ImportDeclaration />);
     const ast = parser.parse(`
         import { Temp, Temp2 } from "./temp"
+
+        /* comment */
     `);
     saveAST(ast, "ImportDeclaration-2.json");
     expect(ast).toMatchSnapshot();

diff --git a/test/parser/__snapshots__/expression.test.tsx.snap b/test/parser/__snapshots__/expression.test.tsx.snap
@@ -70,7 +70,7 @@ Object {
   "types": Array [
     Object {
       "kind": "StringTypeLiteral",
-      "value": " ",
+      "value": "",
     },
     Object {
       "kind": "StringTypeLiteral",