chrome-devtools-frontend 1.0.930109 → 1.0.930993

package/front_end/ui/legacy/components/text_editor/text_editor-legacy.ts

@@ -28,9 +28,6 @@ TextEditor.TextEditorBookMark = TextEditorModule.CodeMirrorTextEditor.TextEditor
 /** @constructor */
 TextEditor.CodeMirrorTextEditorFactory = TextEditorModule.CodeMirrorTextEditor.CodeMirrorTextEditorFactory;
 
-/** @constructor */
-TextEditor.SyntaxHighlighter = TextEditorModule.SyntaxHighlighter.SyntaxHighlighter;
-
 /** @constructor */
 TextEditor.TextEditorAutocompleteController =
     TextEditorModule.TextEditorAutocompleteController.TextEditorAutocompleteController;

package/front_end/ui/legacy/components/text_editor/text_editor.ts

@@ -5,11 +5,9 @@
 import './cm_modes.js';
 
 import * as CodeMirrorTextEditor from './CodeMirrorTextEditor.js';
-import * as SyntaxHighlighter from './SyntaxHighlighter.js';
 import * as TextEditorAutocompleteController from './TextEditorAutocompleteController.js';
 
 export {
   CodeMirrorTextEditor,
-  SyntaxHighlighter,
   TextEditorAutocompleteController,
 };

package/package.json

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

package/scripts/migration/class-fields/migrate.js

@@ -44,11 +44,24 @@ for (const file of files) {
         continue;
       }
 
-      property.toggleModifier('private', false);
       // https://github.com/dsherret/ts-morph/issues/1198
-      property.rename(`SOME_STUPID_PREFIX_${name}`, {
+      const newName = `SOME_STUPID_PREFIX_${name}`;
+
+      property.toggleModifier('private', false);
+      property.rename(newName, {
         renameInComments: true,
       });
+      for (const reference of property.findReferencesAsNodes()) {
+        // The first ancestor is the property access on `this.`.
+        const containingNode = reference.getAncestors()[1];
+        // Replace all `delete this.#somePrivateVariable;` (since that is illegal on private class fields)
+        // and replace it with an assignment to `undefined`.
+        if (containingNode.getKind() === SyntaxKind.DeleteExpression) {
+          console.log(`Replacing delete statement on line ${reference.getStartLineNumber()}`);
+          // We should replace the statement, not the expression itself.
+          containingNode.getFirstAncestor().replaceWithText(`this.${newName} = undefined;`);
+        }
+      }
     }
   }
   file.saveSync();

package/scripts/migration/class-fields/migrate.sh

@@ -0,0 +1,10 @@
+# This script expects to be called from the root of the repository
+# Example:
+# scripts/migration/class-fields/migrate.sh panels/console
+#
+$PWD/third_party/node/node.py --output scripts/migration/class-fields/migrate.js $1/
+find $PWD/front_end/$1/ -type f -exec sed -i -e 's/SOME_STUPID_PREFIX_/#/g' {} \;
+git cl format --js
+NINJA_SUMMARIZE_BUILD=1 autoninja -C out/Default front_end/$1:bundle
+git add .
+git commit -m "Migrate to private class fields in $1" -m "" -m "R=szuend@chromium.org" -m "" -m "Bug: 1222126"

package/front_end/ui/legacy/components/text_editor/SyntaxHighlighter.ts

@@ -1,62 +0,0 @@
-// Copyright 2021 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import * as TextUtils from '../../../../models/text_utils/text_utils.js';
-import * as UI from '../../legacy.js';
-
-export class SyntaxHighlighter {
-  private readonly mimeType: string;
-  private readonly stripExtraWhitespace: boolean;
-
-  constructor(mimeType: string, stripExtraWhitespace: boolean) {
-    this.mimeType = mimeType;
-    this.stripExtraWhitespace = stripExtraWhitespace;
-  }
-
-  createSpan(content: string, className: string): Element {
-    const span = document.createElement('span');
-    span.className = className.replace(/\S+/g, 'cm-$&');
-    if (this.stripExtraWhitespace && className !== 'whitespace') {
-      content = content.replace(/^[\n\r]*/, '').replace(/\s*$/, '');
-    }
-    UI.UIUtils.createTextChild(span, content);
-    return span;
-  }
-
-  syntaxHighlightNode(node: Element): Promise<void> {
-    const lines = node.textContent ? node.textContent.split('\n') : [];
-    let plainTextStart: number;
-    let line: string;
-
-    node.removeChildren();
-    const tokenize = TextUtils.CodeMirrorUtils.TokenizerFactory.instance().createTokenizer(this.mimeType);
-    for (let i = 0; i < lines.length; ++i) {
-      line = lines[i];
-      plainTextStart = 0;
-      tokenize(line, processToken.bind(this));
-      if (plainTextStart < line.length) {
-        const plainText = line.substring(plainTextStart, line.length);
-        UI.UIUtils.createTextChild(node, plainText);
-      }
-      if (i < lines.length - 1) {
-        UI.UIUtils.createTextChild(node, '\n');
-      }
-    }
-    return Promise.resolve();
-
-    function processToken(
-        this: SyntaxHighlighter, token: string, tokenType: string|null, column: number, newColumn: number): void {
-      if (!tokenType) {
-        return;
-      }
-
-      if (column > plainTextStart) {
-        const plainText = line.substring(plainTextStart, column);
-        UI.UIUtils.createTextChild(node, plainText);
-      }
-      node.appendChild(this.createSpan(token, tokenType));
-      plainTextStart = newColumn;
-    }
-  }
-}