chrome-devtools-frontend 1.0.946920 → 1.0.947377

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

@@ -26,9 +26,10 @@ const empty: CM.Extension = [];
 export const dynamicSetting = CM.Facet.define<DynamicSetting<unknown>>();
 
 // The code below is used to wire up dynamic settings to editors. When
-// you include one of these objects in an editor configuration, the
-// TextEditor class will take care of listening to changes in the
-// setting, and updating the configuration as appropriate.
+// you include the result of calling `instance()` in an editor
+// configuration, the TextEditor class will take care of listening to
+// changes in the setting, and updating the configuration as
+// appropriate.
 
 export class DynamicSetting<T> {
   compartment = new CM.Compartment();
@@ -246,7 +247,7 @@ export const closeBrackets: CM.Extension = [
 // element with the editor styles mounted in it for them. This is
 // annoying, but necessary because a scrollable parent node clips them
 // otherwise, `position: fixed` doesn't work due to `contain` styles,
-// and appending them diretly to `document.body` doesn't work because
+// and appending them directly to `document.body` doesn't work because
 // the necessary style sheets aren't available there.
 let tooltipHost: ShadowRoot|null = null;
 

package/front_end/ui/legacy/components/source_frame/SourceFrame.ts

@@ -112,8 +112,9 @@ export class SourceFrameImpl extends Common.ObjectWrapper.eventMixin<EventTypes,
   private shouldAutoPrettyPrint: boolean;
   private readonly progressToolbarItem: UI.Toolbar.ToolbarItem;
   private textEditorInternal: TextEditor.TextEditor.TextEditor;
-  private prettyBaseDoc: CodeMirror.Text|null = null;
+  // The 'clean' document, before editing
   private baseDoc: CodeMirror.Text;
+  private prettyBaseDoc: CodeMirror.Text|null = null;
   private displayedSelection: CodeMirror.EditorSelection|null = null;
   private searchConfig: UI.SearchableView.SearchConfig|null;
   private delayedFindSearchMatches: (() => void)|null;
@@ -212,27 +213,7 @@ export class SourceFrameImpl extends Common.ObjectWrapper.eventMixin<EventTypes,
       TextEditor.Config.allowScrollPastEof.instance(),
       TextEditor.Config.codeFolding.instance(),
       TextEditor.Config.autoDetectIndent.instance(),
-      CodeMirror.EditorView.theme({
-        '&.cm-editor': {height: '100%'},
-        '.cm-scroller': {overflow: 'auto'},
-        '.cm-lineNumbers .cm-gutterElement.cm-nonBreakableLine': {color: 'var(--color-non-breakable-line)'},
-        '.cm-searchMatch': {
-          border: '1px solid var(--color-search-match-border)',
-          borderRadius: '3px',
-          margin: '0 -1px',
-          '&.cm-searchMatch-selected': {
-            borderRadius: '1px',
-            backgroundColor: 'var(--color-selected-search-match-background)',
-            borderColor: 'var(--color-selected-search-match-background)',
-            '&, & *': {
-              color: 'var(--color-selected-search-match) !important',
-            },
-          },
-        },
-        ':host-context(.pretty-printed) & .cm-lineNumbers .cm-gutterElement': {
-          color: 'var(--legacy-accent-color)',
-        },
-      }),
+      sourceFrameTheme,
       CodeMirror.EditorView.domEventHandlers({
         focus: () => this.onFocus(),
         blur: () => this.onBlur(),
@@ -352,6 +333,9 @@ export class SourceFrameImpl extends Common.ObjectWrapper.eventMixin<EventTypes,
     this.updatePrettyPrintState();
   }
 
+  // If this is a disassembled WASM file or a pretty-printed file,
+  // wire in a line number formatter that shows binary offsets or line
+  // numbers in the original source.
   private getLineNumberFormatter(): CodeMirror.Extension {
     if (this.options.lineNumbers === false) {
       return [];
@@ -1099,18 +1083,20 @@ const searchHighlighter = CodeMirror.ViewPlugin.fromClass(class {
     const {doc} = view.state;
     for (const {from, to} of view.visibleRanges) {
       let pos = from;
-      for (const line of doc.iterLines(doc.lineAt(from).number, doc.lineAt(to).number + 1)) {
-        active.regexp.lastIndex = 0;
-        for (;;) {
-          const match = active.regexp.exec(line);
-          if (!match) {
-            break;
+      for (const part of doc.iterRange(from, to)) {
+        if (part !== '\n') {
+          active.regexp.lastIndex = 0;
+          for (;;) {
+            const match = active.regexp.exec(part);
+            if (!match) {
+              break;
+            }
+            const start = pos + match.index, end = start + match[0].length;
+            const current = active.currentRange && active.currentRange.from === start && active.currentRange.to === end;
+            builder.add(start, end, current ? currentSearchMatchDeco : searchMatchDeco);
           }
-          const start = pos + match.index, end = start + match[0].length;
-          const current = active.currentRange && active.currentRange.from === start && active.currentRange.to === end;
-          builder.add(start, end, current ? currentSearchMatchDeco : searchMatchDeco);
         }
-        pos += line.length + 1;
+        pos += part.length;
       }
     }
     return builder.finish();
@@ -1163,3 +1149,25 @@ function markNonBreakableLines(disassembly: Common.WasmDisassembly.WasmDisassemb
     return CodeMirror.RangeSet.of(marks);
   });
 }
+
+const sourceFrameTheme = CodeMirror.EditorView.theme({
+  '&.cm-editor': {height: '100%'},
+  '.cm-scroller': {overflow: 'auto'},
+  '.cm-lineNumbers .cm-gutterElement.cm-nonBreakableLine': {color: 'var(--color-non-breakable-line)'},
+  '.cm-searchMatch': {
+    border: '1px solid var(--color-search-match-border)',
+    borderRadius: '3px',
+    margin: '0 -1px',
+    '&.cm-searchMatch-selected': {
+      borderRadius: '1px',
+      backgroundColor: 'var(--color-selected-search-match-background)',
+      borderColor: 'var(--color-selected-search-match-background)',
+      '&, & *': {
+        color: 'var(--color-selected-search-match) !important',
+      },
+    },
+  },
+  ':host-context(.pretty-printed) & .cm-lineNumbers .cm-gutterElement': {
+    color: 'var(--legacy-accent-color)',
+  },
+});

package/front_end/ui/legacy/themeColors.css

@@ -110,7 +110,7 @@
   --color-image-preview-background: rgb(255 255 255);
 
   /* Colors for styling inputs */
-  --color-input-outline: rgb(128 134 139);
+  --color-input-outline: rgb(218 220 224);
   --color-input-outline-active: rgb(26 115 232);
   --color-input-outline-error: rgb(217 48 37);
   --color-input-outline-disabled: rgba(128 134 139 / 20%);

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.946920"
+  "version": "1.0.947377"
 }

package/scripts/check_gn.js

@@ -9,7 +9,7 @@ const path = require('path');
 const FRONTEND_PATH = path.resolve(__dirname, '..', 'front_end');
 
 const manifestModules = [];
-for (const config of ['inspector', 'devtools_app', 'js_app', 'worker_app']) {
+for (const config of ['devtools_app', 'js_app']) {
   manifestModules.push(...require(path.resolve(FRONTEND_PATH, 'entrypoints', config, `${config}.json`)).modules);
 }
 

package/scripts/eslint_rules/lib/l10n_filename_matches.js

@@ -5,9 +5,6 @@
 'use strict';
 
 const path = require('path');
-const {devtoolsRootPath} = require('../../devtools_paths.js');
-
-const DEFAULT_FRONT_END_DIRECTORY = path.join(devtoolsRootPath(), 'front_end');
 
 function isModuleScope(context) {
   return context.getScope().type === 'module';
@@ -60,10 +57,13 @@ module.exports = {
           return;
         }
 
-        let frontEndDirectory = DEFAULT_FRONT_END_DIRECTORY;
+        let frontEndDirectory = '';
         if (context.options && context.options[0]?.rootFrontendDirectory) {
           frontEndDirectory = context.options[0].rootFrontendDirectory;
         }
+        if (!frontEndDirectory) {
+          throw new Error('rootFrontendDirectory must be provided.');
+        }
         const currentSourceFile = path.resolve(context.getFilename());
         const currentFileRelativeToFrontEnd = path.relative(frontEndDirectory, currentSourceFile);
 

package/scripts/eslint_rules/tests/l10n_filename_matches_test.js

@@ -17,14 +17,17 @@ ruleTester.run('l10n_filename_matches', rule, {
     {
       code: 'const str_ = i18n.i18n.registerUIStrings(\'components/test.ts\', UIStrings);',
       filename: 'front_end/components/test.ts',
+      options: [{rootFrontendDirectory: path.join(__dirname, '..', '..', '..', 'front_end')}]
     },
     {
       code: 'const str_ = i18n.i18n.registerUIStrings(\'components/ModuleUIStrings.js\', UIStrings);',
       filename: 'front_end/components/test.ts',
+      options: [{rootFrontendDirectory: path.join(__dirname, '..', '..', '..', 'front_end')}]
     },
     {
       code: 'const str_ = i18n.i18n.registerUIStrings(\'components/ModuleUIStrings.ts\', UIStrings);',
       filename: 'front_end/components/test.ts',
+      options: [{rootFrontendDirectory: path.join(__dirname, '..', '..', '..', 'front_end')}]
     },
     {
       code: 'const str_ = i18n.i18n.registerUIStrings(\'ModuleUIStrings.ts\', UIStrings);',
@@ -41,6 +44,7 @@ ruleTester.run('l10n_filename_matches', rule, {
     {
       code: 'const str_ = i18n.i18n.registerUIStrings(\'components/foo.ts\', UIStrings);',
       filename: 'front_end/components/test.ts',
+      options: [{rootFrontendDirectory: path.join(__dirname, '..', '..', '..', 'front_end')}],
       errors: [{
         message:
             'First argument to \'registerUIStrings\' call must be \'components/test.ts\' or the ModuleUIStrings.(js|ts)'

package/front_end/entrypoints/inspector/inspector.json

@@ -1,4 +0,0 @@
-{
-  "modules" : [],
-  "extends": "devtools_app"
-}

package/front_end/entrypoints/worker_app/worker_app.json

@@ -1,3 +0,0 @@
-{
-  "modules" : []
-}

package/front_end/panels/lighthouse/module.json

@@ -1,6 +0,0 @@
-{
-  "resources": [
-    "../../third_party/lighthouse/report-assets/standalone-template.html",
-    "../../third_party/lighthouse/report-assets/report.js"
-  ]
-}

package/front_end/third_party/lighthouse/report-assets/report.d.ts

@@ -1 +0,0 @@
-export {}