chrome-devtools-frontend 1.0.980332 → 1.0.980472

package/front_end/entrypoints/formatter_worker/FormatterWorker.ts

@@ -87,19 +87,17 @@ export function createTokenizer(mimeType: string): (
 export const AbortTokenization = {};
 
 export function evaluatableJavaScriptSubstring(content: string): string {
-  const tokenizer = Acorn.tokenizer(content, {ecmaVersion: ECMA_VERSION});
-  let result = '';
   try {
+    const tokenizer = Acorn.tokenizer(content, {ecmaVersion: ECMA_VERSION});
     let token = tokenizer.getToken();
-    while (token.type !== Acorn.tokTypes.eof && AcornTokenizer.punctuator(token)) {
+    while (AcornTokenizer.punctuator(token)) {
       token = tokenizer.getToken();
     }
 
     const startIndex = token.start;
-    let endIndex: number = token.end;
-    let openBracketsCounter = 0;
+    let endIndex = token.end;
     while (token.type !== Acorn.tokTypes.eof) {
-      const isIdentifier = AcornTokenizer.identifier(token);
+      const isIdentifier = token.type === Acorn.tokTypes.name || token.type === Acorn.tokTypes.privateId;
       const isThis = AcornTokenizer.keyword(token, 'this');
       const isString = token.type === Acorn.tokTypes.string;
       if (!isThis && !isIdentifier && !isString) {
@@ -108,24 +106,35 @@ export function evaluatableJavaScriptSubstring(content: string): string {
 
       endIndex = token.end;
       token = tokenizer.getToken();
-      while (AcornTokenizer.punctuator(token, '.[]')) {
-        if (AcornTokenizer.punctuator(token, '[')) {
-          openBracketsCounter++;
-        }
 
-        if (AcornTokenizer.punctuator(token, ']')) {
-          endIndex = openBracketsCounter > 0 ? token.end : endIndex;
-          openBracketsCounter--;
-        }
+      while (AcornTokenizer.punctuator(token, '[')) {
+        let openBracketCounter = 0;
+        do {
+          if (AcornTokenizer.punctuator(token, '[')) {
+            ++openBracketCounter;
+          }
+          token = tokenizer.getToken();
+          if (AcornTokenizer.punctuator(token, ']')) {
+            if (--openBracketCounter === 0) {
+              endIndex = token.end;
+              token = tokenizer.getToken();
+              break;
+            }
+          }
+        } while (token.type !== Acorn.tokTypes.eof);
+      }
 
-        token = tokenizer.getToken();
+      if (!AcornTokenizer.punctuator(token, '.')) {
+        break;
       }
+
+      token = tokenizer.getToken();
     }
-    result = content.substring(startIndex, endIndex);
+    return content.substring(startIndex, endIndex);
   } catch (e) {
     console.error(e);
+    return '';
   }
-  return result;
 }
 
 export function javaScriptIdentifiers(content: string): {

package/package.json

@@ -54,5 +54,5 @@
     "unittest": "scripts/test/run_unittests.py --no-text-coverage",
     "watch": "third_party/node/node.py --output scripts/watch_build.js"
   },
-  "version": "1.0.980332"
+  "version": "1.0.980472"
 }