chrome-devtools-frontend 1.0.1021097 → 1.0.1021582

package/front_end/third_party/puppeteer/package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "puppeteer",
-  "version": "14.1.1",
+  "version": "15.3.1",
   "description": "A high-level API to control headless Chrome over the DevTools Protocol",
   "keywords": [
     "puppeteer",
@@ -9,11 +9,12 @@
     "automation"
   ],
   "type": "commonjs",
-  "main": "./cjs-entry.js",
+  "main": "./lib/cjs/puppeteer/puppeteer.js",
   "exports": {
     ".": {
-      "import": "./lib/esm/puppeteer/node.js",
-      "require": "./cjs-entry.js"
+      "types": "./lib/types.d.ts",
+      "import": "./lib/esm/puppeteer/puppeteer.js",
+      "require": "./lib/cjs/puppeteer/puppeteer.js"
     },
     "./*": {
       "import": "./*",
@@ -26,64 +27,49 @@
     "node": ">=14.1.0"
   },
   "scripts": {
-    "test-browser": "wtr",
-    "test-browser-watch": "wtr --watch",
-    "unit": "npm run tsc-cjs && npm run tsc-compat-cjs && mocha --config mocha-config/puppeteer-unit-tests.js",
-    "chrome-headless-unit": "cross-env HEADLESS=chrome npm run unit",
-    "unit-debug": "npm run tsc-cjs && npm run tsc-compat-cjs && mocha --inspect-brk --config mocha-config/puppeteer-unit-tests.js",
-    "unit-with-coverage": "cross-env COVERAGE=1 npm run unit",
-    "assert-unit-coverage": "cross-env COVERAGE=1 mocha --config mocha-config/coverage-tests.js",
-    "funit": "cross-env PUPPETEER_PRODUCT=firefox npm run unit",
-    "test": "npm run build && npm run lint --silent && npm run unit-with-coverage && npm run test-browser",
-    "prepare": "node typescript-if-required.js && ([[ $HUSKY = 0 ]] || husky install)",
+    "test": "c8 --check-coverage --lines 94 run-s test:chrome test:chrome:* test:firefox",
+    "test:types": "tsd",
+    "test:install": "scripts/test-install.sh",
+    "test:firefox": "cross-env PUPPETEER_PRODUCT=firefox MOZ_WEBRENDER=0 mocha",
+    "test:chrome": "mocha",
+    "test:chrome:headless": "cross-env HEADLESS=chrome mocha",
+    "test:chrome:headful": "cross-env HEADLESS=false mocha",
     "prepublishOnly": "npm run build",
-    "dev-install": "npm run build && node install.js",
+    "prepare": "node typescript-if-required.js && husky install",
+    "lint": "run-s lint:prettier lint:eslint",
+    "lint:prettier": "prettier --check .",
+    "lint:eslint": "([ \"$CI\" = true ] && eslint --ext js --ext ts --quiet -f codeframe . || eslint --ext js --ext ts .)",
     "install": "node install.js",
-    "eslint": "([ \"$CI\" = true ] && eslint --ext js --ext ts --quiet -f codeframe . || eslint --ext js --ext ts .)",
-    "eslint-fix": "eslint --ext js --ext ts --fix .",
+    "generate:types": "node utils/export_all.js && api-extractor run --local --verbose && eslint --ext ts --no-ignore --no-eslintrc -c .eslintrc.types.cjs --fix lib/types.d.ts",
+    "generate:markdown": "ts-node -O '{\"module\":\"commonjs\"}' utils/generate_docs.ts && prettier --ignore-path none --write docs",
+    "generate:esm-package-json": "echo '{\"type\": \"module\"}' > lib/esm/package.json",
+    "format": "run-s format:*",
+    "format:prettier": "prettier --write .",
+    "format:eslint": "eslint --ext js --ext ts --fix .",
+    "docs": "run-s build generate:markdown",
+    "debug": "npm run build && mocha --inspect-brk",
     "commitlint": "commitlint --from=HEAD~1",
-    "prettier": "prettier --check .",
-    "prettier-fix": "prettier --write .",
-    "lint": "npm run eslint && npm run build && npm run doc && npm run prettier",
-    "doc": "node utils/doclint/cli.js",
-    "generate-api-docs-for-testing": "commonmark docs/api.md > docs/api.html",
-    "clean-lib": "rimraf lib",
-    "build": "npm run tsc && npm run generate-d-ts && npm run generate-esm-package-json",
-    "tsc": "npm run clean-lib && tsc --version && (npm run tsc-cjs & npm run tsc-esm) && (npm run tsc-compat-cjs & npm run tsc-compat-esm)",
-    "tsc-cjs": "tsc -b src/tsconfig.cjs.json",
-    "tsc-esm": "tsc -b src/tsconfig.esm.json",
-    "tsc-compat-cjs": "tsc -b compat/cjs/tsconfig.json",
-    "tsc-compat-esm": "tsc -b compat/esm/tsconfig.json",
-    "apply-next-version": "node utils/apply_next_version.js",
-    "test-install": "scripts/test-install.sh",
-    "clean-docs": "rimraf website/docs && rimraf docs-api-json",
-    "generate-d-ts": "npm run clean-docs && api-extractor run --local --verbose",
-    "generate-docs": "npm run generate-d-ts && api-documenter markdown -i docs-api-json -o website/docs && node utils/remove-tag.js",
-    "generate-esm-package-json": "echo '{\"type\": \"module\"}' > lib/esm/package.json",
-    "ensure-correct-devtools-protocol-revision": "ts-node -s scripts/ensure-correct-devtools-protocol-package",
-    "ensure-pinned-deps": "ts-node -s scripts/ensure-pinned-deps",
-    "test-types-file": "ts-node -s scripts/test-ts-definition-files.ts",
-    "release": "node utils/remove_version_suffix.js && standard-version --commit-all",
-    "build-docs-production": "cd website && npm install && npm run build"
+    "clean": "rimraf lib",
+    "check": "run-p check:*",
+    "check:protocol-revision": "ts-node -s scripts/ensure-correct-devtools-protocol-package",
+    "check:pinned-deps": "ts-node -s scripts/ensure-pinned-deps",
+    "build": "run-s build:tsc generate:types generate:esm-package-json",
+    "build:tsc": "tsc --version && run-p build:tsc:*",
+    "build:tsc:esm": "tsc -b src/tsconfig.esm.json",
+    "build:tsc:cjs": "tsc -b src/tsconfig.cjs.json",
+    "build:tsc:test": "tsc -b test"
   },
   "files": [
-    "lib/types.d.ts",
-    "lib/**/*.d.ts",
-    "lib/**/*.d.ts.map",
-    "lib/**/*.js",
-    "lib/**/*.js.map",
-    "lib/**/package.json",
+    "lib",
     "install.js",
-    "typescript-if-required.js",
-    "cjs-entry.js",
-    "cjs-entry-core.js"
+    "typescript-if-required.js"
   ],
   "author": "The Chromium Authors",
   "license": "Apache-2.0",
   "dependencies": {
     "cross-fetch": "3.1.5",
     "debug": "4.3.4",
-    "devtools-protocol": "0.0.982423",
+    "devtools-protocol": "0.0.1011705",
     "extract-zip": "2.0.1",
     "https-proxy-agent": "5.0.1",
     "pkg-dir": "4.2.0",
@@ -92,50 +78,61 @@
     "rimraf": "3.0.2",
     "tar-fs": "2.1.1",
     "unbzip2-stream": "1.4.3",
-    "ws": "8.6.0"
+    "ws": "8.8.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "16.2.4",
-    "@commitlint/config-conventional": "16.2.4",
-    "@microsoft/api-documenter": "7.17.12",
-    "@microsoft/api-extractor": "7.23.2",
+    "@commitlint/cli": "17.0.1",
+    "@commitlint/config-conventional": "17.0.2",
+    "@microsoft/api-documenter": "7.18.0",
+    "@microsoft/api-extractor": "7.24.2",
+    "@microsoft/api-extractor-model": "7.21.0",
     "@types/debug": "4.1.7",
+    "@types/diff": "5.0.2",
     "@types/mime": "2.0.3",
     "@types/mocha": "9.1.1",
-    "@types/node": "17.0.31",
+    "@types/node": "17.0.38",
+    "@types/pixelmatch": "5.2.4",
+    "@types/pngjs": "6.0.1",
     "@types/progress": "2.0.5",
     "@types/proxy-from-env": "1.0.1",
     "@types/rimraf": "3.0.2",
+    "@types/semver": "7.3.10",
     "@types/sinon": "10.0.11",
     "@types/tar-fs": "2.0.1",
+    "@types/unbzip2-stream": "1.4.0",
     "@types/ws": "8.5.3",
-    "@typescript-eslint/eslint-plugin": "5.23.0",
-    "@typescript-eslint/parser": "5.22.0",
-    "@web/test-runner": "0.13.27",
+    "@typescript-eslint/eslint-plugin": "5.27.0",
+    "@typescript-eslint/parser": "5.27.0",
+    "c8": "7.11.3",
     "commonmark": "0.30.0",
     "cross-env": "7.0.3",
-    "eslint": "8.15.0",
+    "diff": "5.1.0",
+    "eslint": "8.16.0",
     "eslint-config-prettier": "8.5.0",
+    "eslint-formatter-codeframe": "7.32.1",
     "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-mocha": "10.0.4",
+    "eslint-plugin-mocha": "10.0.5",
     "eslint-plugin-prettier": "4.0.0",
-    "eslint-plugin-unicorn": "42.0.0",
+    "eslint-plugin-tsdoc": "0.2.16",
+    "eslint-plugin-unused-imports": "2.0.0",
     "esprima": "4.0.1",
     "expect": "25.2.7",
-    "husky": "7.0.4",
-    "jpeg-js": "0.4.3",
+    "gts": "3.1.0",
+    "husky": "8.0.1",
+    "jpeg-js": "0.4.4",
     "mime": "3.0.0",
     "minimist": "1.2.6",
     "mocha": "10.0.0",
     "ncp": "2.0.0",
+    "npm-run-all": "4.1.5",
     "pixelmatch": "5.3.0",
     "pngjs": "6.0.0",
     "prettier": "2.6.2",
-    "sinon": "13.0.2",
+    "semver": "7.3.7",
+    "sinon": "14.0.0",
     "source-map-support": "0.5.21",
-    "standard-version": "9.3.2",
     "text-diff": "1.0.1",
-    "ts-node": "10.7.0",
-    "typescript": "4.6.4"
+    "tsd": "0.21.0",
+    "typescript": "4.7.2"
   }
 }

package/front_end/third_party/puppeteer/package/typescript-if-required.js

@@ -17,15 +17,20 @@
 const child_process = require('child_process');
 const path = require('path');
 const fs = require('fs');
-const { promisify } = require('util');
+const {promisify} = require('util');
 
 const exec = promisify(child_process.exec);
 const fsAccess = promisify(fs.access);
 
-const fileExists = async (filePath) =>
-  fsAccess(filePath)
-    .then(() => true)
-    .catch(() => false);
+const fileExists = async filePath => {
+  return fsAccess(filePath)
+    .then(() => {
+      return true;
+    })
+    .catch(() => {
+      return false;
+    });
+};
 /*
 
  * Now Puppeteer is built with TypeScript, we need to ensure that
@@ -40,7 +45,7 @@ const fileExists = async (filePath) =>
  * place.
  */
 async function compileTypeScript() {
-  return exec('npm run tsc').catch((error) => {
+  return exec('npm run build:tsc').catch(error => {
     console.error('Error running TypeScript', error);
     process.exit(1);
   });
@@ -49,13 +54,17 @@ async function compileTypeScript() {
 async function compileTypeScriptIfRequired() {
   const libPath = path.join(__dirname, 'lib');
   const libExists = await fileExists(libPath);
-  if (libExists) return;
+  if (libExists) {
+    return;
+  }
 
   console.log('Puppeteer:', 'Compiling TypeScript...');
   await compileTypeScript();
 }
 
 // It's being run as node typescript-if-required.js, not require('..')
-if (require.main === module) compileTypeScriptIfRequired();
+if (require.main === module) {
+  compileTypeScriptIfRequired();
+}
 
 module.exports = compileTypeScriptIfRequired;

package/front_end/third_party/puppeteer/puppeteer.ts

@@ -2,18 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import { Browser } from './package/lib/esm/puppeteer/common/Browser.js';
-import { Connection } from './package/lib/esm/puppeteer/common/Connection.js';
-import { type ConnectionTransport } from './package/lib/esm/puppeteer/common/ConnectionTransport.js';
-import { Frame } from './package/lib/esm/puppeteer/common/FrameManager.js';
-import { ElementHandle } from './package/lib/esm/puppeteer/common/JSHandle.js';
-import { Page } from './package/lib/esm/puppeteer/common/Page.js';
+import { Browser } from "./package/lib/esm/puppeteer/common/Browser.js";
+import { Connection } from "./package/lib/esm/puppeteer/common/Connection.js";
+import { type ConnectionTransport } from "./package/lib/esm/puppeteer/common/ConnectionTransport.js";
+import { Frame } from "./package/lib/esm/puppeteer/common/FrameManager.js";
+import { ElementHandle } from "./package/lib/esm/puppeteer/common/ElementHandle";
+import { Page } from "./package/lib/esm/puppeteer/common/Page.js";
 
-export {
-  Browser,
-  Connection,
-  ConnectionTransport,
-  ElementHandle,
-  Frame,
-  Page,
-};
+export { Browser, Connection, ConnectionTransport, ElementHandle, Frame, Page };

package/front_end/ui/components/linear_memory_inspector/LinearMemoryInspector.ts

@@ -122,10 +122,7 @@ export class LinearMemoryInspector extends HTMLElement {
   #outerMemoryLength = 0;
 
   #address = -1;
-  #highlightInfo: HighlightInfo = {
-    size: 0,
-    startAddress: 0,
-  };
+  #highlightInfo?: HighlightInfo;
 
   #currentNavigatorMode = Mode.Submitted;
   #currentNavigatorAddressLine = `${this.#address}`;
@@ -165,7 +162,7 @@ export class LinearMemoryInspector extends HTMLElement {
     this.#valueTypeModes = data.valueTypeModes || this.#valueTypeModes;
     this.#valueTypes = data.valueTypes || this.#valueTypes;
     this.#endianness = data.endianness || this.#endianness;
-    this.#highlightInfo = data.highlightInfo || this.#highlightInfo;
+    this.#highlightInfo = data.highlightInfo;
     this.#setAddress(data.address);
     this.#render();
   }

package/front_end/ui/components/linear_memory_inspector/LinearMemoryInspectorController.ts

@@ -14,6 +14,7 @@ import {Events as LmiEvents, LinearMemoryInspectorPaneImpl} from './LinearMemory
 import type {ValueType, ValueTypeMode} from './ValueInterpreterDisplayUtils.js';
 import {Endianness, getDefaultValueTypeMapping} from './ValueInterpreterDisplayUtils.js';
 import * as Bindings from '../../../models/bindings/bindings.js';
+import type {HighlightInfo} from './LinearMemoryViewerUtils.js';
 
 const UIStrings = {
   /**
@@ -198,6 +199,8 @@ export class LinearMemoryInspectorController extends SDK.TargetManager.SDKModelO
       memoryObj = response.obj;
     }
 
+    const highlightInfo = this.#extractHighlightInfo(obj, memoryAddress);
+
     if (memoryAddress !== undefined) {
       Host.userMetrics.linearMemoryInspectorTarget(
           Host.UserMetrics.LinearMemoryInspectorTarget.DWARFInspectableAddress);
@@ -222,7 +225,7 @@ export class LinearMemoryInspectorController extends SDK.TargetManager.SDKModelO
     const memory = memoryProperty?.value;
 
     if (this.#bufferIdToRemoteObject.has(id)) {
-      this.#paneInstance.reveal(id, memoryAddress);
+      this.#paneInstance.reveal(id, memoryAddress, highlightInfo);
       void UI.ViewManager.ViewManager.instance().showView('linear-memory-inspector');
       return;
     }
@@ -231,10 +234,26 @@ export class LinearMemoryInspectorController extends SDK.TargetManager.SDKModelO
     this.#bufferIdToRemoteObject.set(id, buffer.object());
     const arrayBufferWrapper = new RemoteArrayBufferWrapper(buffer);
 
-    this.#paneInstance.create(id, title, arrayBufferWrapper, memoryAddress);
+    this.#paneInstance.create(id, title, arrayBufferWrapper, memoryAddress, highlightInfo);
     void UI.ViewManager.ViewManager.instance().showView('linear-memory-inspector');
   }
 
+  #extractHighlightInfo(obj: SDK.RemoteObject.RemoteObject, memoryAddress?: number): HighlightInfo|undefined {
+    let highlightInfo;
+    if (obj instanceof Bindings.DebuggerLanguagePlugins.ValueNode) {
+      // Currently, only the StaticallyTypedValueNode subclass implements the sourceType getter.
+      // The other subclasses throw a 'Not Implemented' Error.
+      try {
+        highlightInfo = {
+          startAddress: memoryAddress || 0,
+          size: obj.sourceType.typeInfo.size,
+        };
+      } catch (unusedError) {
+      }
+    }
+    return highlightInfo;
+  }
+
   modelRemoved(model: SDK.RuntimeModel.RuntimeModel): void {
     for (const [bufferId, remoteObject] of this.#bufferIdToRemoteObject) {
       if (model === remoteObject.runtimeModel()) {
@@ -248,6 +267,7 @@ export class LinearMemoryInspectorController extends SDK.TargetManager.SDKModelO
     const debuggerModel = event.data;
     for (const [bufferId, remoteObject] of this.#bufferIdToRemoteObject) {
       if (debuggerModel.runtimeModel() === remoteObject.runtimeModel()) {
+        this.#paneInstance.resetHighlightInfo(bufferId);
         this.#paneInstance.refreshView(bufferId);
       }
     }

package/front_end/ui/components/linear_memory_inspector/LinearMemoryInspectorPane.ts

@@ -10,6 +10,7 @@ import type {AddressChangedEvent, MemoryRequestEvent, Settings, SettingsChangedE
 import {LinearMemoryInspector} from './LinearMemoryInspector.js';
 import type {LazyUint8Array} from './LinearMemoryInspectorController.js';
 import {LinearMemoryInspectorController} from './LinearMemoryInspectorController.js';
+import type {HighlightInfo} from './LinearMemoryViewerUtils.js';
 
 const UIStrings = {
   /**
@@ -74,8 +75,18 @@ export class LinearMemoryInspectorPaneImpl extends Common.ObjectWrapper.eventMix
     return inspectorInstance;
   }
 
-  create(tabId: string, title: string, arrayWrapper: LazyUint8Array, address?: number): void {
-    const inspectorView = new LinearMemoryInspectorView(arrayWrapper, address);
+  // Introduced to access Views for testings.
+  getViewForTabId(tabId: string): LinearMemoryInspectorView {
+    const view = this.#tabIdToInspectorView.get(tabId);
+    if (!view) {
+      throw new Error(`No linear memory inspector view for given tab id: ${tabId}`);
+    }
+    return view;
+  }
+
+  create(tabId: string, title: string, arrayWrapper: LazyUint8Array, address?: number, highlightInfo?: HighlightInfo):
+      void {
+    const inspectorView = new LinearMemoryInspectorView(arrayWrapper, address, highlightInfo);
     this.#tabIdToInspectorView.set(tabId, inspectorView);
     this.#tabbedPane.appendTab(tabId, title, inspectorView, undefined, false, true);
     this.#tabbedPane.selectTab(tabId);
@@ -85,27 +96,29 @@ export class LinearMemoryInspectorPaneImpl extends Common.ObjectWrapper.eventMix
     this.#tabbedPane.closeTab(tabId, false);
   }
 
-  reveal(tabId: string, address?: number): void {
-    const view = this.#tabIdToInspectorView.get(tabId);
-    if (!view) {
-      throw new Error(`No linear memory inspector view for given tab id: ${tabId}`);
-    }
+  reveal(tabId: string, address?: number, highlightInfo?: HighlightInfo): void {
+    const view = this.getViewForTabId(tabId);
 
     if (address !== undefined) {
       view.updateAddress(address);
     }
+    if (highlightInfo !== undefined) {
+      view.updateHighlightInfo(highlightInfo);
+    }
     this.refreshView(tabId);
     this.#tabbedPane.selectTab(tabId);
   }
 
   refreshView(tabId: string): void {
-    const view = this.#tabIdToInspectorView.get(tabId);
-    if (!view) {
-      throw new Error(`View for specified tab id does not exist: ${tabId}`);
-    }
+    const view = this.getViewForTabId(tabId);
     view.refreshData();
   }
 
+  resetHighlightInfo(tabId: string): void {
+    const view = this.getViewForTabId(tabId);
+    view.updateHighlightInfo(undefined);
+  }
+
   #tabClosed(event: Common.EventTarget.EventTargetEvent<UI.TabbedPane.EventData>): void {
     const {tabId} = event.data;
     this.#tabIdToInspectorView.delete(tabId);
@@ -124,9 +137,10 @@ export type EventTypes = {
 class LinearMemoryInspectorView extends UI.Widget.VBox {
   #memoryWrapper: LazyUint8Array;
   #address: number;
+  #highlightInfo?: HighlightInfo;
   #inspector: LinearMemoryInspector;
   firstTimeOpen: boolean;
-  constructor(memoryWrapper: LazyUint8Array, address: number|undefined = 0) {
+  constructor(memoryWrapper: LazyUint8Array, address: number|undefined = 0, highlightInfo?: HighlightInfo) {
     super(false);
 
     if (address < 0 || address >= memoryWrapper.length()) {
@@ -135,6 +149,7 @@ class LinearMemoryInspectorView extends UI.Widget.VBox {
 
     this.#memoryWrapper = memoryWrapper;
     this.#address = address;
+    this.#highlightInfo = highlightInfo;
     this.#inspector = new LinearMemoryInspector();
     this.#inspector.addEventListener('memoryrequest', (event: MemoryRequestEvent) => {
       this.#memoryRequested(event);
@@ -166,6 +181,18 @@ class LinearMemoryInspectorView extends UI.Widget.VBox {
     this.#address = address;
   }
 
+  updateHighlightInfo(highlightInfo?: HighlightInfo): void {
+    if (highlightInfo !== undefined) {
+      if (highlightInfo.startAddress < 0 || highlightInfo.startAddress >= this.#memoryWrapper.length()) {
+        throw new Error('Highlight info start address is out of bounds.');
+      }
+      if (highlightInfo.size < 0) {
+        throw new Error('Highlight size cannot be negative.');
+      }
+    }
+    this.#highlightInfo = highlightInfo;
+  }
+
   refreshData(): void {
     void LinearMemoryInspectorController.getMemoryForAddress(this.#memoryWrapper, this.#address).then(({
                                                                                                         memory,
@@ -189,6 +216,7 @@ class LinearMemoryInspectorView extends UI.Widget.VBox {
         valueTypes,
         valueTypeModes,
         endianness,
+        highlightInfo: this.#highlightInfo,
       };
     });
   }

package/front_end/ui/components/linear_memory_inspector/LinearMemoryViewer.ts

@@ -52,10 +52,7 @@ export class LinearMemoryViewer extends HTMLElement {
   #memory = new Uint8Array();
   #address = 0;
   #memoryOffset = 0;
-  #highlightInfo: HighlightInfo = {
-    size: 0,
-    startAddress: 0,
-  };
+  #highlightInfo?: HighlightInfo;
 
   #numRows = 1;
   #numBytesInRow = BYTE_GROUP_SIZE;
@@ -75,7 +72,7 @@ export class LinearMemoryViewer extends HTMLElement {
 
     this.#memory = data.memory;
     this.#address = data.address;
-    this.#highlightInfo = data.highlightInfo || this.#highlightInfo;
+    this.#highlightInfo = data.highlightInfo;
     this.#memoryOffset = data.memoryOffset;
     this.#focusOnByte = data.focus;
     this.#update();
@@ -288,6 +285,9 @@ export class LinearMemoryViewer extends HTMLElement {
   }
 
   #shouldBeHighlighted(index: number): boolean {
+    if (this.#highlightInfo === undefined) {
+      return false;
+    }
     return this.#highlightInfo.startAddress <= index
     && index < this.#highlightInfo.startAddress + this.#highlightInfo.size;
   }

package/front_end/ui/legacy/components/utils/Linkifier.ts

@@ -485,6 +485,7 @@ export class Linkifier implements SDK.TargetManager.Observer {
       showColumnNumber: false,
       inlineFrameIndex: 0,
     };
+
     const text = options.text;
     const className = options.className || '';
     const lineNumber = options.lineNumber;
@@ -498,6 +499,7 @@ export class Linkifier implements SDK.TargetManager.Observer {
       if (className) {
         element.className = className;
       }
+
       element.textContent = text || url || i18nString(UIStrings.unknown);
       return element;
     }
@@ -510,7 +512,7 @@ export class Linkifier implements SDK.TargetManager.Observer {
       }
     }
     const title = linkText !== url ? url : '';
-    const linkOptions = {maxLength, title, href: (url), preventClick, tabStop: options.tabStop, bypassURLTrimming};
+    const linkOptions = {maxLength, title, href: url, preventClick, tabStop: options.tabStop, bypassURLTrimming};
     const {link, linkInfo} = Linkifier.createLink(linkText, className, linkOptions);
     if (lineNumber) {
       linkInfo.lineNumber = lineNumber;

package/package.json

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

package/scripts/eslint_rules/lib/inject_checkbox_styles.js

@@ -54,8 +54,10 @@ module.exports = {
           return;
         }
 
-        // Get the absolute path , so we can compare it to COMMON_INPUT_STYLES;
-        const fullImportPath = path.resolve(context.getFilename(), node.source.value);
+        // Get the absolute path of the current file's directory, so we can
+        // compare it to COMMON_INPUT_STYLES and see if the file does import the common styles.
+        const absoluteDirectory = path.dirname(path.resolve(context.getFilename()));
+        const fullImportPath = path.resolve(absoluteDirectory, node.source.value);
         foundInputStylesImport = fullImportPath === COMMON_INPUT_STYLES;
         if (foundInputStylesImport) {
           inputStylesImportedName = node.specifiers[0].local.name;

package/scripts/eslint_rules/tests/inject_checkbox_styles_test.js

@@ -12,12 +12,52 @@ const ruleTester = new (require('eslint').RuleTester)({
 ruleTester.run('inject_checkbox_styles', rule, {
   valid: [
     {
-      code: `import * as Input from '../../input/input.js';
+      code: `import * as Input from '../input/input.js';
+      export class Test extends HTMLElement {
+        readonly #shadow = this.attachShadow({mode: 'open'});
+
+        connectedCallback() {
+          this.#shadow.adoptedStyleSheets = [Input.checkboxStyles];
+        }
+
+        render() {
+          LitHtml.render(LitHtml.html\`<input type="checkbox" />\`, this.#shadow, {host:this});
+        }
+      }`,
+      filename: 'front_end/ui/components/datagrid/datagrid.ts',
+    },
+    {
+      code: `import * as ComponentHelpers from '../../components/helpers/helpers.js';
+import * as LitHtml from '../../lit-html/lit-html.js';
+import * as Input from '../input/input.js';
+import settingCheckboxStyles from './settingCheckbox.css.js';
+
+export class SettingCheckbox extends HTMLElement {
+  static readonly litTagName = LitHtml.literal\`setting-checkbox\`;
+  readonly #shadow = this.attachShadow({mode: 'open'});
+
+  connectedCallback(): void {
+    this.#shadow.adoptedStyleSheets = [Input.checkboxStyles, settingCheckboxStyles];
+  }
+
+  #render(): void {
+    LitHtml.render(
+        LitHtml.html\`<p>
+        <label>
+          <input type="checkbox" />
+        </label>
+      </p>\`, this.#shadow, {host: this});
+  }
+}`,
+      filename: 'front_end/ui/components/settings/SettingsCheckbox.ts',
+    },
+    {
+      code: `import * as Input from '../input/input.js';
       export class Test extends HTMLElement {
         private readonly shadow = this.attachShadow({mode: 'open'});
 
         connectedCallback() {
-          this.shadow.adoptedStyleSheets = [Input.checkboxStyles];
+          this.shadow.adoptedStyleSheets = [Input.checkboxStyles, someOtherStyles];
         }
 
         render() {
@@ -28,7 +68,7 @@ ruleTester.run('inject_checkbox_styles', rule, {
     },
     // Nothing to do with checkboxes, so this rule should not apply.
     {
-      code: `import * as Input from '../../input/input.js';
+      code: `import * as Input from '../input/input.js';
       import {Foo} from './bar.js';
 
       export class Test extends HTMLElement {
@@ -92,7 +132,7 @@ ruleTester.run('inject_checkbox_styles', rule, {
 
     // No adopting of the styles.
     {
-      code: `import * as Input from '../../input/input.js';
+      code: `import * as Input from '../input/input.js';
       export class Test extends HTMLElement {
         private readonly shadow = this.attachShadow({mode: 'open'});
 
@@ -106,7 +146,7 @@ ruleTester.run('inject_checkbox_styles', rule, {
 
     // Adopting the wrong styles
     {
-      code: `import * as Input from '../../input/input.js';
+      code: `import * as Input from '../input/input.js';
       import {fooStyles} from './who-knows.js';
 
       export class Test extends HTMLElement {