chrome-devtools-frontend 1.0.929965 → 1.0.930993

package/front_end/models/emulation/EmulatedDevices.ts

@@ -49,8 +49,8 @@ export class EmulatedDevice {
   isDualScreen: boolean;
   verticalSpanned: Orientation;
   horizontalSpanned: Orientation;
-  private showInternal: string;
-  private showByDefault: boolean;
+  #showInternal: string;
+  #showByDefault: boolean;
 
   constructor() {
     this.title = '';
@@ -67,8 +67,8 @@ export class EmulatedDevice {
     this.verticalSpanned = {width: 0, height: 0, outlineInsets: null, outlineImage: null, hinge: null};
     this.horizontalSpanned = {width: 0, height: 0, outlineInsets: null, outlineImage: null, hinge: null};
 
-    this.showInternal = _Show.Default;
-    this.showByDefault = true;
+    this.#showInternal = _Show.Default;
+    this.#showByDefault = true;
   }
 
   static fromJSONV1(json: any): EmulatedDevice|null {
@@ -251,8 +251,8 @@ export class EmulatedDevice {
         mode.image = (parseValue(modes[i], 'image', 'string', null) as string);
         result.modes.push(mode);
       }
-      result.showByDefault = (parseValue(json, 'show-by-default', 'boolean', undefined) as boolean);
-      result.showInternal = (parseValue(json, 'show', 'string', _Show.Default) as string);
+      result.#showByDefault = (parseValue(json, 'show-by-default', 'boolean', undefined) as boolean);
+      result.#showInternal = (parseValue(json, 'show', 'string', _Show.Default) as string);
 
       return result;
     } catch (e) {
@@ -350,9 +350,9 @@ export class EmulatedDevice {
       json['modes'].push(mode);
     }
 
-    json['show-by-default'] = this.showByDefault;
+    json['show-by-default'] = this.#showByDefault;
     json['dual-screen'] = this.isDualScreen;
-    json['show'] = this.showInternal;
+    json['show'] = this.#showInternal;
 
     if (this.userAgentMetadata) {
       json['user-agent-metadata'] = this.userAgentMetadata;
@@ -441,18 +441,18 @@ export class EmulatedDevice {
     }
   }
   show(): boolean {
-    if (this.showInternal === _Show.Default) {
-      return this.showByDefault;
+    if (this.#showInternal === _Show.Default) {
+      return this.#showByDefault;
     }
-    return this.showInternal === _Show.Always;
+    return this.#showInternal === _Show.Always;
   }
 
   setShow(show: boolean): void {
-    this.showInternal = show ? _Show.Always : _Show.Never;
+    this.#showInternal = show ? _Show.Always : _Show.Never;
   }
 
   copyShowFrom(other: EmulatedDevice): void {
-    this.showInternal = other.showInternal;
+    this.#showInternal = other.#showInternal;
   }
 
   touch(): boolean {
@@ -495,21 +495,21 @@ export const _Show = {
 let _instance: EmulatedDevicesList;
 
 export class EmulatedDevicesList extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
-  private readonly standardSetting: Common.Settings.Setting<any[]>;
-  private standardInternal: Set<EmulatedDevice>;
-  private readonly customSetting: Common.Settings.Setting<any[]>;
-  private readonly customInternal: Set<EmulatedDevice>;
+  readonly #standardSetting: Common.Settings.Setting<any[]>;
+  #standardInternal: Set<EmulatedDevice>;
+  readonly #customSetting: Common.Settings.Setting<any[]>;
+  readonly #customInternal: Set<EmulatedDevice>;
   constructor() {
     super();
 
-    this.standardSetting = Common.Settings.Settings.instance().createSetting('standardEmulatedDeviceList', []);
-    this.standardInternal = new Set();
-    this.listFromJSONV1(this.standardSetting.get(), this.standardInternal);
+    this.#standardSetting = Common.Settings.Settings.instance().createSetting('standardEmulatedDeviceList', []);
+    this.#standardInternal = new Set();
+    this.listFromJSONV1(this.#standardSetting.get(), this.#standardInternal);
     this.updateStandardDevices();
 
-    this.customSetting = Common.Settings.Settings.instance().createSetting('customEmulatedDeviceList', []);
-    this.customInternal = new Set();
-    if (!this.listFromJSONV1(this.customSetting.get(), this.customInternal)) {
+    this.#customSetting = Common.Settings.Settings.instance().createSetting('customEmulatedDeviceList', []);
+    this.#customInternal = new Set();
+    if (!this.listFromJSONV1(this.#customSetting.get(), this.#customInternal)) {
       this.saveCustomDevices();
     }
   }
@@ -529,8 +529,8 @@ export class EmulatedDevicesList extends Common.ObjectWrapper.ObjectWrapper<Even
         devices.add(device);
       }
     }
-    this.copyShowValues(this.standardInternal, devices);
-    this.standardInternal = devices;
+    this.copyShowValues(this.#standardInternal, devices);
+    this.#standardInternal = devices;
     this.saveStandardDevices();
   }
 
@@ -555,40 +555,40 @@ export class EmulatedDevicesList extends Common.ObjectWrapper.ObjectWrapper<Even
   }
 
   standard(): EmulatedDevice[] {
-    return [...this.standardInternal];
+    return [...this.#standardInternal];
   }
 
   custom(): EmulatedDevice[] {
-    return [...this.customInternal];
+    return [...this.#customInternal];
   }
 
   revealCustomSetting(): void {
-    Common.Revealer.reveal(this.customSetting);
+    Common.Revealer.reveal(this.#customSetting);
   }
 
   addCustomDevice(device: EmulatedDevice): void {
-    this.customInternal.add(device);
+    this.#customInternal.add(device);
     this.saveCustomDevices();
   }
 
   removeCustomDevice(device: EmulatedDevice): void {
-    this.customInternal.delete(device);
+    this.#customInternal.delete(device);
     this.saveCustomDevices();
   }
 
   saveCustomDevices(): void {
     const json: any[] = [];
-    this.customInternal.forEach(device => json.push(device.toJSON()));
+    this.#customInternal.forEach(device => json.push(device.toJSON()));
 
-    this.customSetting.set(json);
+    this.#customSetting.set(json);
     this.dispatchEventToListeners(Events.CustomDevicesUpdated);
   }
 
   saveStandardDevices(): void {
     const json: any[] = [];
-    this.standardInternal.forEach(device => json.push(device.toJSON()));
+    this.#standardInternal.forEach(device => json.push(device.toJSON()));
 
-    this.standardSetting.set(json);
+    this.#standardSetting.set(json);
     this.dispatchEventToListeners(Events.StandardDevicesUpdated);
   }
 

package/front_end/panels/console/ConsoleView.ts

@@ -41,6 +41,7 @@ import * as Bindings from '../../models/bindings/bindings.js';
 import * as IssuesManager from '../../models/issues_manager/issues_manager.js';
 import * as Logs from '../../models/logs/logs.js';
 import * as TextUtils from '../../models/text_utils/text_utils.js';
+import * as CodeHighlighter from '../../ui/components/code_highlighter/code_highlighter.js';
 import * as IssueCounter from '../../ui/components/issue_counter/issue_counter.js';
 // eslint-disable-next-line rulesdir/es_modules_import
 import objectValueStyles from '../../ui/legacy/components/object_ui/objectValue.css.js';
@@ -676,7 +677,7 @@ export class ConsoleView extends UI.Widget.VBox implements UI.SearchableView.Sea
     super.wasShown();
     this.updateIssuesToolbarItem();
     this.viewport.refresh();
-    this.registerCSSFiles([consoleViewStyles, objectValueStyles]);
+    this.registerCSSFiles([consoleViewStyles, objectValueStyles, CodeHighlighter.Style.default]);
   }
 
   focus(): void {

package/front_end/panels/console/ConsoleViewMessage.ts

@@ -42,11 +42,11 @@ import type * as IssuesManager from '../../models/issues_manager/issues_manager.
 import * as Logs from '../../models/logs/logs.js';
 import * as TextUtils from '../../models/text_utils/text_utils.js';
 import * as Workspace from '../../models/workspace/workspace.js';
+import * as CodeHighlighter from '../../ui/components/code_highlighter/code_highlighter.js';
 import * as IssueCounter from '../../ui/components/issue_counter/issue_counter.js';
 import * as RequestLinkIcon from '../../ui/components/request_link_icon/request_link_icon.js';
 import * as DataGrid from '../../ui/legacy/components/data_grid/data_grid.js';
 import * as ObjectUI from '../../ui/legacy/components/object_ui/object_ui.js';
-import * as TextEditor from '../../ui/legacy/components/text_editor/text_editor.js';
 import * as Components from '../../ui/legacy/components/utils/utils.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import * as ThemeSupport from '../../ui/legacy/theme_support/theme_support.js';
@@ -1925,8 +1925,8 @@ export class ConsoleCommand extends ConsoleViewMessage {
     newContentElement.appendChild(this.formattedCommand);
 
     if (this.formattedCommand.textContent.length < MaxLengthToIgnoreHighlighter) {
-      const javascriptSyntaxHighlighter = new TextEditor.SyntaxHighlighter.SyntaxHighlighter('text/javascript', true);
-      javascriptSyntaxHighlighter.syntaxHighlightNode(this.formattedCommand).then(this.updateSearch.bind(this));
+      CodeHighlighter.CodeHighlighter.highlightNode(this.formattedCommand, 'text/javascript')
+          .then(this.updateSearch.bind(this));
     } else {
       this.updateSearch();
     }