[Web Inspector] Fix syntax errror when viewing import.meta

oven-sh · Aug 14, 2023 · 68de5bf · 68de5bf
1 parent e5b29e9
commit 68de5bf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Source/WebInspectorUI/Tools/JSFormatter/JSFormatterDebug.js b/Source/WebInspectorUI/Tools/JSFormatter/JSFormatterDebug.js
@@ -2,7 +2,8 @@ JSFormatterDebug = class JSFormatterDebug
 {
     constructor(sourceText, sourceType)
     {
-        let tree = esprima.parse(sourceText, {attachComment: true, range: true, tokens: true, sourceType});
+        const parseFn = sourceType === "module" ? esprima.parseModule : esprima.parse;
+        let tree = parseFn(sourceText, {attachComment: true, range: true, tokens: true, sourceType});
         let walker = new ESTreeWalker(this._before.bind(this), this._after.bind(this));
 
         this._statistics = {

diff --git a/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js b/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js
@@ -33,7 +33,8 @@ WI.ScriptSyntaxTree = class ScriptSyntaxTree
 
         try {
             let sourceType = this._script.sourceType === WI.Script.SourceType.Module ? "module" : "script";
-            let esprimaSyntaxTree = esprima.parse(sourceText, {loc: true, range: true, sourceType});
+            const parseFn = sourceType === "module" ? esprima.parseModule : esprima.parse;
+            let esprimaSyntaxTree = parseFn(sourceText, {loc: true, range: true, sourceType});
             this._syntaxTree = this._createInternalSyntaxTree(esprimaSyntaxTree);
             this._parsedSuccessfully = true;
         } catch (error) {

diff --git a/Source/WebInspectorUI/UserInterface/Workers/Formatter/JSFormatter.js b/Source/WebInspectorUI/UserInterface/Workers/Formatter/JSFormatter.js
@@ -32,10 +32,11 @@ JSFormatter = class JSFormatter
     constructor(sourceText, sourceType, builder, indentString = "    ")
     {
         this._success = false;
+        const parseFn = sourceType === "module" ? esprima.parseModule : esprima.parse;
 
         let tree = (function() {
             try {
-                return esprima.parse(sourceText, {attachComment: true, range: true, tokens: true, sourceType});
+                return parseFn(sourceText, {attachComment: true, range: true, tokens: true, sourceType});
             } catch(error) {
                 console.error(`Failed to parse source text of type "${sourceType}".`, error);
                 return null;