chrome-devtools-frontend 1.0.945329 → 1.0.946351

package/config/gni/all_devtools_files.gni

@@ -30,7 +30,6 @@ all_devtools_files = [
   "front_end/legacy_test_runner/bindings_test_runner/IsolatedFilesystemTestRunner.js",
   "front_end/legacy_test_runner/bindings_test_runner/OverridesTestRunner.js",
   "front_end/legacy_test_runner/bindings_test_runner/PersistenceTestRunner.js",
-  "front_end/third_party/codemirror/codemirror.css",
   "front_end/legacy_test_runner/console_test_runner/console_test_runner.js",
   "front_end/legacy_test_runner/coverage_test_runner/coverage_test_runner.js",
   "front_end/legacy_test_runner/cpu_profiler_test_runner/cpu_profiler_test_runner.js",
@@ -114,7 +113,6 @@ all_devtools_files = [
   "front_end/models/issues_manager/descriptions/TwaPageUnavailableOffline.md",
   "front_end/legacy_test_runner/sdk_test_runner/sdk_test_runner.js",
   "front_end/legacy_test_runner/security_test_runner/security_test_runner.js",
-  "front_end/entrypoints/shell/shell.json",
   "front_end/legacy_test_runner/sources_test_runner/sources_test_runner.js",
   "front_end/legacy_test_runner/sources_test_runner/AutocompleteTestRunner.js",
   "front_end/legacy_test_runner/sources_test_runner/DebuggerTestRunner.js",
@@ -122,9 +120,6 @@ all_devtools_files = [
   "front_end/legacy_test_runner/sources_test_runner/LiveEditTestRunner.js",
   "front_end/legacy_test_runner/sources_test_runner/SearchTestRunner.js",
   "front_end/legacy_test_runner/sources_test_runner/SourcesTestRunner.js",
-  "front_end/ui/legacy/components/text_editor/autocompleteTooltip.css",
-  "front_end/ui/legacy/components/text_editor/cmdevtools.css",
-  "front_end/ui/legacy/components/text_editor/module.json",
   "front_end/third_party/lighthouse/report-assets/report.js",
   "front_end/third_party/lighthouse/report-assets/standalone-template.html",
 ]

package/config/gni/devtools_grd_files.gni

@@ -45,6 +45,7 @@ grd_files_release_sources = [
   "front_end/Images/chromeRight.avif",
   "front_end/Images/chromeSelect.svg",
   "front_end/Images/chromeSelectDark.svg",
+  "front_end/Images/circled_exclamation_icon.svg",
   "front_end/Images/close-icon.svg",
   "front_end/Images/copy_icon.svg",
   "front_end/Images/cssoverview_icons_2x.avif",
@@ -225,7 +226,6 @@ grd_files_release_sources = [
   "front_end/entrypoints/node_app/node_app.js",
   "front_end/entrypoints/node_main/node_main-meta.js",
   "front_end/entrypoints/node_main/node_main.js",
-  "front_end/entrypoints/shell/shell-meta-files.js",
   "front_end/entrypoints/shell/shell.js",
   "front_end/entrypoints/startup/startup.js",
   "front_end/entrypoints/wasmparser_worker/wasmparser_worker-entrypoint.js",
@@ -445,7 +445,6 @@ grd_files_release_sources = [
   "front_end/third_party/codemirror.next/chunk/wast.js",
   "front_end/third_party/codemirror.next/chunk/xml.js",
   "front_end/third_party/codemirror.next/codemirror.next.js",
-  "front_end/third_party/codemirror/codemirror.js",
   "front_end/third_party/diff/diff-legacy.js",
   "front_end/third_party/diff/diff.js",
   "front_end/third_party/i18n/i18n.js",
@@ -497,8 +496,6 @@ grd_files_release_sources = [
   "front_end/ui/legacy/components/source_frame/source_frame-legacy.js",
   "front_end/ui/legacy/components/source_frame/source_frame-meta.js",
   "front_end/ui/legacy/components/source_frame/source_frame.js",
-  "front_end/ui/legacy/components/text_editor/text_editor-legacy.js",
-  "front_end/ui/legacy/components/text_editor/text_editor.js",
   "front_end/ui/legacy/components/utils/utils-legacy.js",
   "front_end/ui/legacy/components/utils/utils.js",
   "front_end/ui/legacy/legacy-legacy.js",
@@ -1263,33 +1260,9 @@ grd_files_debug_sources = [
   "front_end/third_party/acorn-loose/package/dist/acorn-loose.mjs",
   "front_end/third_party/acorn/package/dist/acorn.mjs",
   "front_end/third_party/chromium/client-variations/ClientVariations.js",
-  "front_end/third_party/codemirror/package/addon/comment/comment.js",
-  "front_end/third_party/codemirror/package/addon/edit/closebrackets.js",
-  "front_end/third_party/codemirror/package/addon/edit/matchbrackets.js",
-  "front_end/third_party/codemirror/package/addon/fold/brace-fold.js",
-  "front_end/third_party/codemirror/package/addon/fold/foldcode.js",
-  "front_end/third_party/codemirror/package/addon/fold/foldgutter.js",
-  "front_end/third_party/codemirror/package/addon/mode/multiplex.js",
-  "front_end/third_party/codemirror/package/addon/mode/overlay.js",
-  "front_end/third_party/codemirror/package/addon/mode/simple.js",
   "front_end/third_party/codemirror/package/addon/runmode/runmode-standalone.js",
-  "front_end/third_party/codemirror/package/addon/selection/active-line.js",
-  "front_end/third_party/codemirror/package/addon/selection/mark-selection.js",
-  "front_end/third_party/codemirror/package/lib/codemirror.js",
-  "front_end/third_party/codemirror/package/mode/clike/clike.js",
-  "front_end/third_party/codemirror/package/mode/clojure/clojure.js",
-  "front_end/third_party/codemirror/package/mode/coffeescript/coffeescript.js",
   "front_end/third_party/codemirror/package/mode/css/css.js",
-  "front_end/third_party/codemirror/package/mode/htmlembedded/htmlembedded.js",
-  "front_end/third_party/codemirror/package/mode/htmlmixed/htmlmixed.js",
   "front_end/third_party/codemirror/package/mode/javascript/javascript.js",
-  "front_end/third_party/codemirror/package/mode/jsx/jsx.js",
-  "front_end/third_party/codemirror/package/mode/livescript/livescript.js",
-  "front_end/third_party/codemirror/package/mode/markdown/markdown.js",
-  "front_end/third_party/codemirror/package/mode/php/php.js",
-  "front_end/third_party/codemirror/package/mode/python/python.js",
-  "front_end/third_party/codemirror/package/mode/shell/shell.js",
-  "front_end/third_party/codemirror/package/mode/wast/wast.js",
   "front_end/third_party/codemirror/package/mode/xml/xml.js",
   "front_end/third_party/diff/DiffWrapper.js",
   "front_end/third_party/diff/diff_match_patch.js",
@@ -1455,7 +1428,6 @@ grd_files_debug_sources = [
   "front_end/ui/legacy/SuggestBox.js",
   "front_end/ui/legacy/TabbedPane.js",
   "front_end/ui/legacy/TargetCrashedScreen.js",
-  "front_end/ui/legacy/TextEditor.js",
   "front_end/ui/legacy/TextPrompt.js",
   "front_end/ui/legacy/ThrottledWidget.js",
   "front_end/ui/legacy/Toolbar.js",
@@ -1515,7 +1487,6 @@ grd_files_debug_sources = [
   "front_end/ui/legacy/components/inline_editor/fontEditor.css.js",
   "front_end/ui/legacy/components/inline_editor/swatchPopover.css.js",
   "front_end/ui/legacy/components/object_ui/CustomPreviewComponent.js",
-  "front_end/ui/legacy/components/object_ui/JavaScriptAutocomplete.js",
   "front_end/ui/legacy/components/object_ui/JavaScriptREPL.js",
   "front_end/ui/legacy/components/object_ui/ObjectPopoverHelper.js",
   "front_end/ui/legacy/components/object_ui/ObjectPropertiesSection.js",
@@ -1563,9 +1534,6 @@ grd_files_debug_sources = [
   "front_end/ui/legacy/components/source_frame/resourceSourceFrame.css.legacy.js",
   "front_end/ui/legacy/components/source_frame/xmlTree.css.legacy.js",
   "front_end/ui/legacy/components/source_frame/xmlView.css.legacy.js",
-  "front_end/ui/legacy/components/text_editor/CodeMirrorTextEditor.js",
-  "front_end/ui/legacy/components/text_editor/TextEditorAutocompleteController.js",
-  "front_end/ui/legacy/components/text_editor/cm_modes.js",
   "front_end/ui/legacy/components/utils/ImagePreview.js",
   "front_end/ui/legacy/components/utils/JSPresentationUtils.js",
   "front_end/ui/legacy/components/utils/Linkifier.js",

package/config/gni/devtools_image_files.gni

@@ -56,6 +56,7 @@ devtools_svg_sources = [
   "chevrons.svg",
   "chromeSelect.svg",
   "chromeSelectDark.svg",
+  "circled_exclamation_icon.svg",
   "close-icon.svg",
   "copy_icon.svg",
   "dropdown_7x6_icon.svg",

package/front_end/Images/src/circled_exclamation_icon.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 4.233 4.233" xmlns="http://www.w3.org/2000/svg">
+  <path d="M7.25 10.25h1.5v1.5h-1.5zm0-6h1.5v4.5h-1.5ZM7.992.5C3.853.5.5 3.86.5 8c0 4.14 3.353 7.5 7.492 7.5 4.148 0 7.508-3.36 7.508-7.5 0-4.14-3.36-7.5-7.508-7.5ZM8 14c-3.315 0-6-2.685-6-6s2.685-6 6-6 6 2.685 6 6-2.685 6-6 6z" transform="scale(.26458)" style="fill:#000"/>
+</svg>

package/front_end/core/host/UserMetrics.ts

@@ -611,7 +611,6 @@ export const DevtoolsExperiments: {
   'ignoreListJSFramesOnTimeline': 43,
   'contrastIssues': 44,
   'experimentalCookieFeatures': 45,
-  'bfcacheDebugging': 47,
   'hideIssuesFeature': 48,
   'reportingApiDebugging': 49,
   'syncSettings': 50,

package/front_end/core/i18n/locales/en-US.json

@@ -584,6 +584,9 @@
   "core/sdk/sdk-meta.ts | disabledDarkMode": {
     "message": "Disable"
   },
+  "core/sdk/sdk-meta.ts | disableEmulateAutoDarkMode": {
+    "message": "Disable auto dark mode"
+  },
   "core/sdk/sdk-meta.ts | disableJavascript": {
     "message": "Disable JavaScript"
   },
@@ -614,6 +617,9 @@
   "core/sdk/sdk-meta.ts | doNotEmulateCssMediaType": {
     "message": "Do not emulate CSS media type"
   },
+  "core/sdk/sdk-meta.ts | doNotEmulateDarkMode": {
+    "message": "Do not emulate auto dark mode"
+  },
   "core/sdk/sdk-meta.ts | doNotExtendGridLines": {
     "message": "Do not extend grid lines"
   },
@@ -686,6 +692,9 @@
   "core/sdk/sdk-meta.ts | enabledDarkMode": {
     "message": "Enable"
   },
+  "core/sdk/sdk-meta.ts | enableEmulateAutoDarkMode": {
+    "message": "Enable auto dark mode"
+  },
   "core/sdk/sdk-meta.ts | enableJavascript": {
     "message": "Enable JavaScript"
   },
@@ -6374,6 +6383,9 @@
   "panels/network/NetworkConfigView.ts | caching": {
     "message": "Caching"
   },
+  "panels/network/NetworkConfigView.ts | clientHintsStatusText": {
+    "message": "User agent updated."
+  },
   "panels/network/NetworkConfigView.ts | custom": {
     "message": "Custom..."
   },
@@ -11681,15 +11693,6 @@
   "ui/legacy/components/object_ui/CustomPreviewComponent.ts | showAsJavascriptObject": {
     "message": "Show as JavaScript object"
   },
-  "ui/legacy/components/object_ui/JavaScriptAutocomplete.ts | keys": {
-    "message": "Keys"
-  },
-  "ui/legacy/components/object_ui/JavaScriptAutocomplete.ts | keywords": {
-    "message": "keywords"
-  },
-  "ui/legacy/components/object_ui/JavaScriptAutocomplete.ts | lexicalScopeVariables": {
-    "message": "Lexical scope variables"
-  },
   "ui/legacy/components/object_ui/ObjectPropertiesSection.ts | collapseChildren": {
     "message": "Collapse children"
   },
@@ -11954,9 +11957,6 @@
   "ui/legacy/components/source_frame/XMLView.ts | find": {
     "message": "Find"
   },
-  "ui/legacy/components/text_editor/CodeMirrorTextEditor.ts | codeEditor": {
-    "message": "Code editor"
-  },
   "ui/legacy/components/utils/ImagePreview.ts | currentSource": {
     "message": "Current source:"
   },

package/front_end/core/i18n/locales/en-XL.json

@@ -584,6 +584,9 @@
   "core/sdk/sdk-meta.ts | disabledDarkMode": {
     "message": "D̂íŝáb̂ĺê"
   },
+  "core/sdk/sdk-meta.ts | disableEmulateAutoDarkMode": {
+    "message": "D̂íŝáb̂ĺê áût́ô d́âŕk̂ ḿôd́ê"
+  },
   "core/sdk/sdk-meta.ts | disableJavascript": {
     "message": "D̂íŝáb̂ĺê J́âv́âŚĉŕîṕt̂"
   },
@@ -614,6 +617,9 @@
   "core/sdk/sdk-meta.ts | doNotEmulateCssMediaType": {
     "message": "D̂ó n̂ót̂ ém̂úl̂át̂é ĈŚŜ ḿêd́îá t̂ýp̂é"
   },
+  "core/sdk/sdk-meta.ts | doNotEmulateDarkMode": {
+    "message": "D̂ó n̂ót̂ ém̂úl̂át̂é âút̂ó d̂ár̂ḱ m̂ód̂é"
+  },
   "core/sdk/sdk-meta.ts | doNotExtendGridLines": {
     "message": "D̂ó n̂ót̂ éx̂t́êńd̂ ǵr̂íd̂ ĺîńêś"
   },
@@ -686,6 +692,9 @@
   "core/sdk/sdk-meta.ts | enabledDarkMode": {
     "message": "Êńâb́l̂é"
   },
+  "core/sdk/sdk-meta.ts | enableEmulateAutoDarkMode": {
+    "message": "Êńâb́l̂é âút̂ó d̂ár̂ḱ m̂ód̂é"
+  },
   "core/sdk/sdk-meta.ts | enableJavascript": {
     "message": "Êńâb́l̂é Ĵáv̂áŜćr̂íp̂t́"
   },
@@ -6374,6 +6383,9 @@
   "panels/network/NetworkConfigView.ts | caching": {
     "message": "Ĉáĉh́îńĝ"
   },
+  "panels/network/NetworkConfigView.ts | clientHintsStatusText": {
+    "message": "Ûśêŕ âǵêńt̂ úp̂d́ât́êd́."
+  },
   "panels/network/NetworkConfigView.ts | custom": {
     "message": "Ĉúŝt́ôḿ..."
   },
@@ -11681,15 +11693,6 @@
   "ui/legacy/components/object_ui/CustomPreviewComponent.ts | showAsJavascriptObject": {
     "message": "Ŝh́ôẃ âś Ĵáv̂áŜćr̂íp̂t́ ôb́ĵéĉt́"
   },
-  "ui/legacy/components/object_ui/JavaScriptAutocomplete.ts | keys": {
-    "message": "K̂éŷś"
-  },
-  "ui/legacy/components/object_ui/JavaScriptAutocomplete.ts | keywords": {
-    "message": "k̂éŷẃôŕd̂ś"
-  },
-  "ui/legacy/components/object_ui/JavaScriptAutocomplete.ts | lexicalScopeVariables": {
-    "message": "L̂éx̂íĉál̂ śĉóp̂é v̂ár̂íâb́l̂éŝ"
-  },
   "ui/legacy/components/object_ui/ObjectPropertiesSection.ts | collapseChildren": {
     "message": "Ĉól̂ĺâṕŝé ĉh́îĺd̂ŕêń"
   },
@@ -11954,9 +11957,6 @@
   "ui/legacy/components/source_frame/XMLView.ts | find": {
     "message": "F̂ín̂d́"
   },
-  "ui/legacy/components/text_editor/CodeMirrorTextEditor.ts | codeEditor": {
-    "message": "Ĉód̂é êd́ît́ôŕ"
-  },
   "ui/legacy/components/utils/ImagePreview.ts | currentSource": {
     "message": "Ĉúr̂ŕêńt̂ śôúr̂ćê:"
   },

package/front_end/core/root/Runtime.ts

@@ -59,7 +59,6 @@ export const mappingForLayoutTests = new Map<string, string>([
   ['ui/legacy/components/source_frame', 'source_frame'],
   ['ui/legacy/components/color_picker', 'color_picker'],
   ['ui/legacy/components/cookie_table', 'cookie_table'],
-  ['ui/legacy/components/text_editor', 'text_editor'],
   ['ui/legacy/components/quick_open', 'quick_open'],
   ['ui/legacy/components/utils', 'components'],
 ]);

package/front_end/core/sdk/CSSMetadata.ts

@@ -567,7 +567,6 @@ const extraPropertyValues = {
       'ui-monospace',
       'ui-rounded',
       '-webkit-body',
-      '-webkit-pictograph',
     ],
   },
   'zoom': {values: ['normal']},

package/front_end/core/sdk/CSSProperty.ts

@@ -6,8 +6,8 @@ import * as TextUtils from '../../models/text_utils/text_utils.js';
 import * as Common from '../common/common.js';
 import * as HostModule from '../host/host.js';
 import * as Platform from '../platform/platform.js';
+import * as Root from '../root/root.js';
 import type * as Protocol from '../../generated/protocol.js';
-import type * as CodeMirrorModule from '../../third_party/codemirror/codemirror-legacy.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
 
 import {cssMetadata, GridAreaRowRegex} from './CSSMetadata.js';
 import type {Edit} from './CSSModel.js';
@@ -178,7 +178,7 @@ export class CSSProperty {
 
   static formatStyle(
       styleText: string, indentation: string, endIndentation: string,
-      tokenizerFactory: TextUtils.TextUtils.TokenizerFactory, codeMirrorMode?: CodeMirror.Mode<unknown>): string {
+      tokenizerFactory: TextUtils.TextUtils.TokenizerFactory): string {
     const doubleIndent = indentation.substring(endIndentation.length) + indentation;
     if (indentation) {
       indentation = '\n' + indentation;
@@ -188,7 +188,7 @@ export class CSSProperty {
     let propertyText = '';
     let insideProperty = false;
     let needsSemi = false;
-    const tokenize = tokenizerFactory.createTokenizer('text/css', codeMirrorMode);
+    const tokenize = tokenizerFactory.createTokenizer('text/css');
 
     tokenize('*{' + styleText + '}', processToken);
     if (insideProperty) {
@@ -199,10 +199,10 @@ export class CSSProperty {
 
     function processToken(token: string, tokenType: string|null, _column: number, _newColumn: number): void {
       if (!insideProperty) {
-        const disabledProperty = tokenType && tokenType.includes('css-comment') && isDisabledProperty(token);
+        const disabledProperty = tokenType && tokenType.includes('comment') && isDisabledProperty(token);
         const isPropertyStart = tokenType &&
-            (tokenType.includes('css-string') || tokenType.includes('css-meta') || tokenType.includes('css-property') ||
-             tokenType.includes('css-variable-2'));
+            (tokenType.includes('string') || tokenType.includes('meta') || tokenType.includes('property') ||
+             tokenType.includes('variable-2'));
         if (disabledProperty) {
           result = result.trimRight() + indentation + token;
         } else if (isPropertyStart) {
@@ -210,7 +210,7 @@ export class CSSProperty {
           propertyText = token;
         } else if (token !== ';' || needsSemi) {
           result += token;
-          if (token.trim() && !(tokenType && tokenType.includes('css-comment'))) {
+          if (token.trim() && !(tokenType && tokenType.includes('comment'))) {
             needsSemi = token !== ';';
           }
         }
@@ -227,11 +227,18 @@ export class CSSProperty {
         // implementation takes special care to restore a single
         // whitespace token in this edge case. https://crbug.com/1071296
         const trimmedPropertyText = propertyText.trim();
-        result = result.trimRight() + indentation + trimmedPropertyText +
-            (trimmedPropertyText.endsWith(':') ? ' ' : '') + ';';
+        result =
+            result.trimRight() + indentation + trimmedPropertyText + (trimmedPropertyText.endsWith(':') ? ' ' : '');
         needsSemi = false;
         insideProperty = false;
         propertyName = '';
+        if (Root.Runtime.experiments.isEnabled('preciseChanges')) {
+          result += token;
+          return;
+        }
+        // We preserve the legacy behavior to always add semicolon to
+        // declarations regardless of its original text.
+        result += ';';
         if (token === '}') {
           result += '}';
         }

package/front_end/core/sdk/sdk-meta.ts

@@ -306,8 +306,8 @@ const UIStrings = {
   */
   enableCache: 'Enable cache',
   /**
-   * @description Title of a setting under the Network category that can be invoked through the Command Menu
-   */
+  * @description Title of a setting under the Network category that can be invoked through the Command Menu
+  */
   disableCache: 'Disable cache (while DevTools is open)',
   /**
   * @description The name of a checkbox setting in the Rendering tool. This setting
@@ -315,13 +315,25 @@ const UIStrings = {
   */
   emulateAutoDarkMode: 'Emulate auto dark mode',
   /**
-  *@description Title of a setting for emulating enabled auto dark mode.
+  * @description Title of a setting for enabling auto dark mode.
+  */
+  enableEmulateAutoDarkMode: 'Enable auto dark mode',
+  /**
+  * @description Text to emulate enabled auto dark mode.
   */
   enabledDarkMode: 'Enable',
   /**
-   * @description Title of a setting for emulating disabled auto dark mode.
-   */
+  * @description Title of a setting for disabling auto dark mode.
+  */
+  disableEmulateAutoDarkMode: 'Disable auto dark mode',
+  /**
+  * @description Text to emulate disabled auto dark mode.
+  */
   disabledDarkMode: 'Disable',
+  /**
+  * @description Title of a setting for disabling dark mode emulation.
+  */
+  doNotEmulateDarkMode: 'Do not emulate auto dark mode',
 };
 const str_ = i18n.i18n.registerUIStrings('core/sdk/sdk-meta.ts', UIStrings);
 const i18nLazyString = i18n.i18n.getLazilyComputedLocalizedString.bind(undefined, str_);
@@ -1042,17 +1054,17 @@ Common.Settings.registerSettingExtension({
   defaultValue: 'default',
   options: [
     {
-      title: i18nLazyString(UIStrings.emulateAutoDarkMode),
+      title: i18nLazyString(UIStrings.doNotEmulateDarkMode),
       text: i18nLazyString(UIStrings.noEmulation),
       value: 'default',
     },
     {
-      title: i18nLazyString(UIStrings.emulateAutoDarkMode),
+      title: i18nLazyString(UIStrings.enableEmulateAutoDarkMode),
       text: i18nLazyString(UIStrings.enabledDarkMode),
       value: 'enabled',
     },
     {
-      title: i18nLazyString(UIStrings.emulateAutoDarkMode),
+      title: i18nLazyString(UIStrings.disableEmulateAutoDarkMode),
       text: i18nLazyString(UIStrings.disabledDarkMode),
       value: 'disabled',
     },

package/front_end/devtools_compatibility.js

@@ -1490,13 +1490,6 @@
       styleRules.push('* { min-width: 0; min-height: 0; }');
     }
 
-    if (majorVersion <= 51) {
-      // Support for quirky border-image behavior (<M51), see:
-      // https://bugs.chromium.org/p/chromium/issues/detail?id=559258
-      styleRules.push('.cm-breakpoint .CodeMirror-linenumber { border-style: solid !important; }');
-      styleRules.push(
-          '.cm-breakpoint.cm-breakpoint-conditional .CodeMirror-linenumber { border-style: solid !important; }');
-    }
     if (majorVersion <= 71) {
       styleRules.push(
           '.coverage-toolbar-container, .animation-timeline-toolbar-container, .computed-properties { flex-basis: auto; }');

package/front_end/entrypoints/devtools_app/devtools_app.js

@@ -3,6 +3,9 @@
 // found in the LICENSE file.
 import '../shell/shell.js';
 import './devtools_app-meta-files.js';
+
+import * as Main from '../main/main.js';
 import * as Startup from '../startup/startup.js';
 
+new Main.MainImpl.MainImpl();
 Startup.RuntimeInstantiator.startApplication('devtools_app');

package/front_end/entrypoints/devtools_app/devtools_app.json

@@ -1,6 +1,5 @@
 {
   "modules" : [
     { "name": "panels/lighthouse" }
-  ],
-  "extends": "shell"
+  ]
 }

package/front_end/entrypoints/formatter_worker/CSSFormatter.ts

@@ -86,9 +86,7 @@ export class CSSFormatter {
     if (startLine !== this.lastLine) {
       this.state.eatWhitespace = true;
     }
-    // The css- prefix is optional, as we override that in the tokenizer defined
-    // in CodeMirrorTextEditor.js. In a worker context, we don't use the prefix.
-    if (type && (/^(css-)?property/.test(type) || /^(css-)?variable-2/.test(type)) && !this.state.inPropertyValue) {
+    if (type && (/^property/.test(type) || /^variable-2/.test(type)) && !this.state.inPropertyValue) {
       this.state.seenProperty = true;
     }
     this.lastLine = startLine;

package/front_end/entrypoints/formatter_worker/FormatterActions.ts

@@ -9,7 +9,5 @@ export const enum FormatterActions {
   JAVASCRIPT_OUTLINE = 'javaScriptOutline',
   JAVASCRIPT_IDENTIFIERS = 'javaScriptIdentifiers',
   EVALUATE_JAVASCRIPT_SUBSTRING = 'evaluatableJavaScriptSubstring',
-  FIND_LAST_EXPRESSION = 'findLastExpression',
-  FIND_LAST_FUNCTION_CALL = 'findLastFunctionCall',
   ARGUMENTS_LIST = 'argumentsList',
 }

package/front_end/entrypoints/formatter_worker/FormatterWorker.ts

@@ -230,55 +230,6 @@ export function format(
   return result;
 }
 
-export function findLastFunctionCall(content: string): {
-  baseExpression: string,
-  receiver: string,
-  argumentIndex: number,
-  functionName: string,
-}|null {
-  if (content.length > 10000) {
-    return null;
-  }
-  try {
-    const tokenizer = Acorn.tokenizer(content, {ecmaVersion: ECMA_VERSION});
-    while (tokenizer.getToken().type !== Acorn.tokTypes.eof) {
-    }
-  } catch (e) {
-    return null;
-  }
-
-  const suffix = '000)';
-  const base = _lastCompleteExpression(content, suffix, new Set(['CallExpression', 'NewExpression']));
-  if (!base) {
-    return null;
-  }
-  if (base.baseNode.type !== 'CallExpression' && base.baseNode.type !== 'NewExpression') {
-    return null;
-  }
-  const callee = base.baseNode['callee'];
-
-  let functionName = '';
-  const functionProperty = callee.type === 'Identifier' ? callee : (callee as Acorn.ESTree.MemberExpression).property;
-  if (functionProperty) {
-    if (functionProperty.type === 'Identifier') {
-      functionName = functionProperty.name;
-    } else if (functionProperty.type === 'Literal') {
-      functionName = (functionProperty.value as string);
-    }
-  }
-
-  const argumentIndex = base.baseNode['arguments'].length - 1;
-  const baseExpression =
-      `(${base.baseExpression.substring(callee.start - base.baseNode.start, callee.end - base.baseNode.start)})`;
-  let receiver = '(function(){return this})()';
-  if (callee.type === 'MemberExpression') {
-    const receiverBase = callee['object'];
-    receiver =
-        base.baseExpression.substring(receiverBase.start - base.baseNode.start, receiverBase.end - base.baseNode.start);
-  }
-  return {baseExpression, receiver, argumentIndex, functionName};
-}
-
 export function argumentsList(content: string): string[] {
   if (content.length > 10000) {
     return [];
@@ -349,77 +300,6 @@ export function argumentsList(content: string): string[] {
   }
 }
 
-export function findLastExpression(content: string): string|null {
-  if (content.length > 10000) {
-    return null;
-  }
-  try {
-    const tokenizer = Acorn.tokenizer(content, {ecmaVersion: ECMA_VERSION});
-    while (tokenizer.getToken().type !== Acorn.tokTypes.eof) {
-    }
-  } catch (e) {
-    return null;
-  }
-
-  const suffix = '.DEVTOOLS';
-  try {
-    Acorn.parse(content + suffix, {ecmaVersion: ECMA_VERSION});
-  } catch (parseError) {
-    // If this is an invalid location for a '.', don't attempt to give autocomplete
-    if (parseError.message.startsWith('Unexpected token') && parseError.pos === content.length) {
-      return null;
-    }
-  }
-  const base = _lastCompleteExpression(content, suffix, new Set(['MemberExpression', 'Identifier']));
-  if (base) {
-    return base.baseExpression;
-  }
-  return null;
-}
-
-// TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export function _lastCompleteExpression(content: string, suffix: string, types: Set<string>): {
-  baseNode: Acorn.ESTree.Node,
-  baseExpression: string,
-}|null {
-  let ast: Acorn.ESTree.Node|null = null;
-  let parsedContent = '';
-  for (let i = 0; i < content.length; i++) {
-    try {
-      // Wrap content in paren to successfully parse object literals
-      parsedContent = content[i] === '{' ? `(${content.substring(i)})${suffix}` : `${content.substring(i)}${suffix}`;
-      ast = (Acorn.parse(parsedContent, {ecmaVersion: ECMA_VERSION}) as Acorn.ESTree.Node);
-      break;
-    } catch (e) {
-    }
-  }
-  if (!ast) {
-    return null;
-  }
-  const astEnd = ast.end;
-  let baseNode: Acorn.ESTree.Node|null = null;
-  const walker = new ESTreeWalker(node => {
-    if (baseNode || node.end < astEnd) {
-      return ESTreeWalker.SkipSubtree;
-    }
-    if (types.has(node.type)) {
-      baseNode = node;
-    }
-    return;
-  });
-  walker.walk(ast);
-  if (!baseNode) {
-    return null;
-  }
-  let baseExpression =
-      parsedContent.substring((baseNode as Acorn.ESTree.Node).start, parsedContent.length - suffix.length);
-  if (baseExpression.startsWith('{')) {
-    baseExpression = `(${baseExpression})`;
-  }
-  return {baseNode, baseExpression};
-}
-
 (function disableLoggingForTest(): void {
   if (Root.Runtime.Runtime.queryParam('test')) {
     console.error = (): undefined => undefined;

package/front_end/entrypoints/formatter_worker/formatter_worker-entrypoint.ts

@@ -2,12 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import '../../third_party/codemirror/package/addon/runmode/runmode-standalone.js';
-import '../../third_party/codemirror/package/mode/css/css.js';
-import '../../third_party/codemirror/package/mode/xml/xml.js';
-import '../../third_party/codemirror/package/mode/javascript/javascript.js';
-
 import * as Platform from '../../core/platform/platform.js';
+
 import * as FormatterWorker from './formatter_worker.js';
 
 import {FormatterActions} from './FormatterActions.js';
@@ -38,12 +34,6 @@ self.onmessage = function(event: MessageEvent): void {
     case FormatterActions.EVALUATE_JAVASCRIPT_SUBSTRING:
       self.postMessage(FormatterWorker.FormatterWorker.evaluatableJavaScriptSubstring(params.content));
       break;
-    case FormatterActions.FIND_LAST_EXPRESSION:
-      self.postMessage(FormatterWorker.FormatterWorker.findLastExpression(params.content));
-      break;
-    case FormatterActions.FIND_LAST_FUNCTION_CALL:
-      self.postMessage(FormatterWorker.FormatterWorker.findLastFunctionCall(params.content));
-      break;
     case FormatterActions.ARGUMENTS_LIST:
       self.postMessage(FormatterWorker.FormatterWorker.argumentsList(params.content));
       break;

package/front_end/entrypoints/formatter_worker/formatter_worker.ts

@@ -2,6 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import '../../third_party/codemirror/package/addon/runmode/runmode-standalone.js';
+import '../../third_party/codemirror/package/mode/css/css.js';
+import '../../third_party/codemirror/package/mode/xml/xml.js';
+import '../../third_party/codemirror/package/mode/javascript/javascript.js';
+
 import * as CSSFormatter from './CSSFormatter.js';
 import * as CSSRuleParser from './CSSRuleParser.js';
 import * as FormattedContentBuilder from './FormattedContentBuilder.js';