Add support to new import statement v3; Modify importReactorCommand s…

…tring to support new statement;
lf-lang · Sep 12, 2024 · 6b5b2f7 · 6b5b2f7
1 parent a58711b
commit 6b5b2f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/lfview/lf-data-provider.ts b/src/lfview/lf-data-provider.ts
@@ -406,7 +406,7 @@ export class LFDataProvider implements vscode.TreeDataProvider<LFDataProviderNod
                 return;
             }
             const relativePath = this.getRelativePath(editor.document.uri.fsPath, node.uri.fsPath);
-            const importText = `import ${node.label!.toString()} from "${relativePath}"\n`;
+            const importText = `import ${node.label!.toString()} from <${relativePath}>\n`;
             const position = await this.getTargetPosition(editor.document.uri);
             this.addTextOnActiveEditor(editor, position!.end, importText);
         }

diff --git a/syntaxes/lflang.tmLanguage.json b/syntaxes/lflang.tmLanguage.json
@@ -281,7 +281,7 @@
         },
         "import-statement": {
             "begin": "(?=^\\s*import\\b)",
-            "end": ";|(?<=\")\\s*$",
+            "end": ";|(?<=\")\\s*$|(?<=>)\\s*$",
             "patterns": [
                 {
                     "include": "#context-insensitive"
@@ -301,13 +301,9 @@
                     ]
                 },
                 {
-                    "begin": "(?<=from)\\s*(\"|<)",
-                    "end": "(\"|>)",
+                    "begin": "(?<=from)\\s*(<)",
+                    "end": "(>)",
                     "patterns": [
-                        {
-                            "name": "string.quoted.double.lflang",
-                            "match": "(?<=\").*?(?=\")"
-                        },
                         {
                             "name": "string.quoted.angle.lflang",
                             "match": "(?<=<).*?(?=>)"