Merge branch 'ChromeDevTools:main' into main

Author: tysonthomas9

DEPS

@@ -12,27 +12,27 @@ vars = {
   'build_with_chromium': False,
 
   'build_url': 'https://chromium.googlesource.com/chromium/src/build.git',
-  'build_revision': '3f69beb61e8cc5cd868c39fb860c1e81c759e81e',
+  'build_revision': '800bdadb6c11e7152551824e98cfce9ffd85d386',
 
   'buildtools_url': 'https://chromium.googlesource.com/chromium/src/buildtools.git',
   'buildtools_revision': 'b0b6f725c28dbe2d5d7ca6edc9b81a352965eee9',
 
   'depot_tools_url': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
-  'depot_tools_revision': '9e9b885a7b85483e59723d5e1e69235dcb577077',
+  'depot_tools_revision': '0699a53d841453368d0ad17deb1c7d29b6db09a6',
 
   'inspector_protocol_url': 'https://chromium.googlesource.com/deps/inspector_protocol',
   'inspector_protocol_revision': '07272ab9a30fd555890fda0718f4c2c25931653a',
 
   # Keeping track of the last time we rolled the browser protocol files.
-  'chromium_browser_protocol_revision' : '3bf451b0bf3beb7acf5f343700e2d8115c187e00',
+  'chromium_browser_protocol_revision' : '67b3be36a4efb989a69c585f68bee1d86f193768',
 
   'clang_format_url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git',
   'clang_format_revision': '37f6e68a107df43b7d7e044fd36a13cbae3413f2',
 
   'emscripten_tag': 'ade9d780ff17c88d81aa13860361743e3c1e1396',
 
   # GN CIPD package version.
-  'gn_version': 'git_revision:037970ef8d8e5b1d9d3d6defc9aa3886dbfea29a',
+  'gn_version': 'git_revision:5d0a4153b0bcc86c5a23310d5b648a587be3c56d',
 
   'cmake_version': 'version:[email protected]',
 

build

@@ -695,7 +695,7 @@ export default defineConfig([
       // errors on {describe, it}.only
       'mocha/no-exclusive-tests': 'error',
 
-      'mocha/no-async-suite': 'error',
+      'mocha/no-async-describe': 'error',
       'mocha/no-global-tests': 'error',
       'mocha/no-nested-tests': 'error',
 
@@ -739,22 +739,22 @@ export default defineConfig([
         {
           name: 'describeWithDevtoolsExtension',
           type: 'suite',
-          interface: 'BDD',
+          interfaces: ['BDD', 'TDD'],
         },
         {
           name: 'describeWithEnvironment',
           type: 'suite',
-          interface: 'BDD',
+          interfaces: ['BDD', 'TDD'],
         },
         {
           name: 'describeWithLocale',
           type: 'suite',
-          interface: 'BDD',
+          interfaces: ['BDD', 'TDD'],
         },
         {
           name: 'describeWithMockConnection',
           type: 'suite',
-          interface: 'BDD',
+          interfaces: ['BDD', 'TDD'],
         },
       ],
     },

eslint.config.mjs

@@ -559,10 +559,6 @@ describeWithEnvironment('AidaClient', () => {
       });
     }
 
-    beforeEach(() => {
-      sinon.restore();
-    });
-
     it('should return NO_INTERNET when navigator is not online', async () => {
       const navigatorDescriptor = Object.getOwnPropertyDescriptor(globalThis, 'navigator')!;
       Object.defineProperty(globalThis, 'navigator', {
@@ -631,10 +627,6 @@ describeWithEnvironment('AidaClient', () => {
   });
 
   describe('completeCode', () => {
-    beforeEach(() => {
-      sinon.restore();
-    });
-
     it('handles successful response', async () => {
       const mockResult: AidaCodeCompleteResult = {
         response: JSON.stringify({

front_end/core/host/AidaClient.test.ts

@@ -228,6 +228,27 @@ export enum EditType {
   ACCEPT_COMPLETION = 6,
 }
 
+export enum Reason {
+  // Unknown reason.
+  UNKNOWN = 0,
+
+  // The file is currently open.
+  CURRENTLY_OPEN = 1,
+
+  // The file is opened recently.
+  RECENTLY_OPENED = 2,
+
+  // The file is edited recently.
+  RECENTLY_EDITED = 3,
+
+  // The file is located within the same directory.
+  COLOCATED = 4,
+
+  // Included based on relation to code around the cursor (e.g: could be
+  // provided by local IDE analysis)
+  RELATED_FILE = 5,
+}
+
 /* eslint-disable @typescript-eslint/naming-convention */
 export interface CompletionRequest {
   client: string;
@@ -236,6 +257,11 @@ export interface CompletionRequest {
   options?: CompleteCodeOptions;
   metadata: RequestMetadata;
   last_user_action?: EditType;
+  additional_files?: Array<{
+    path: string,
+    content: string,
+    included_reason: Reason,
+  }>;
 }
 /* eslint-enable @typescript-eslint/naming-convention */
 

front_end/core/host/AidaClient.ts

@@ -13,6 +13,7 @@ import * as UI from '../../ui/legacy/legacy.js';
 import * as Main from './main.js';
 
 const CLICK_COUNT_LIMIT = 2;
+const DELAY_BEFORE_PROMOTION_COLLAPSE_IN_MS = 5000;
 
 const {GlobalAiButton} = Main.GlobalAiButton;
 
@@ -78,7 +79,7 @@ describeWithEnvironment('GlobalAiButton', () => {
       Common.Settings.Settings.instance().settingForTest('global-ai-button-click-count').set(CLICK_COUNT_LIMIT - 1);
 
       const {view} = await createWidget();
-      clock.tick(5000);
+      clock.tick(DELAY_BEFORE_PROMOTION_COLLAPSE_IN_MS);
 
       const finalInput = await view.nextInput;
       assert.strictEqual(finalInput.state, Main.GlobalAiButton.GlobalAiButtonState.DEFAULT);
@@ -129,4 +130,40 @@ describeWithEnvironment('GlobalAiButton', () => {
       assert.strictEqual(view.input.state, Main.GlobalAiButton.GlobalAiButtonState.DEFAULT);
     });
   });
+
+  describe('promotion lifecycle with toolbar hover', () => {
+    let headerElement: HTMLElement;
+    beforeEach(() => {
+      headerElement = document.createElement('div');
+      sinon.stub(UI.InspectorView.InspectorView.instance().tabbedPane, 'headerElement').returns(headerElement);
+    });
+
+    it('does not revert from PROMOTION to DEFAULT state while the toolbar is hovered', async () => {
+      updateHostConfig({
+        devToolsGlobalAiButton: {
+          promotionEnabled: true,
+        },
+      });
+      clock = sinon.useFakeTimers({now: new Date('2025-01-01'), toFake: ['setTimeout', 'Date']});
+      Common.Settings.Settings.instance().settingForTest('global-ai-button-click-count').set(CLICK_COUNT_LIMIT - 1);
+
+      const {view} = await createWidget();
+      assert.strictEqual(view.input.state, Main.GlobalAiButton.GlobalAiButtonState.PROMOTION);
+
+      // Simulate hovering over the toolbar.
+      headerElement.dispatchEvent(new MouseEvent('mouseenter'));
+      clock.tick(DELAY_BEFORE_PROMOTION_COLLAPSE_IN_MS);
+
+      // The button should still be in the promotion state.
+      assert.strictEqual(view.input.state, Main.GlobalAiButton.GlobalAiButtonState.PROMOTION);
+
+      // Simulate hovering out of the toolbar.
+      headerElement.dispatchEvent(new MouseEvent('mouseleave'));
+      clock.tick(DELAY_BEFORE_PROMOTION_COLLAPSE_IN_MS);
+
+      // The button should now be in the default state.
+      const finalInput = await view.nextInput;
+      assert.strictEqual(finalInput.state, Main.GlobalAiButton.GlobalAiButtonState.DEFAULT);
+    });
+  });
 });

front_end/entrypoints/main/GlobalAiButton.test.ts

@@ -68,6 +68,8 @@ export type View = typeof DEFAULT_VIEW;
 export class GlobalAiButton extends UI.Widget.Widget {
   #view: View;
   #buttonState: GlobalAiButtonState = GlobalAiButtonState.DEFAULT;
+  #mouseOnMainToolbar = false;
+  #returnToDefaultStateTimeout?: number;
 
   constructor(element?: HTMLElement, view?: View) {
     super(element);
@@ -79,6 +81,36 @@ export class GlobalAiButton extends UI.Widget.Widget {
     }
   }
 
+  override willHide(): void {
+    this.#removeHoverEventListeners();
+
+    if (this.#returnToDefaultStateTimeout) {
+      window.clearTimeout(this.#returnToDefaultStateTimeout);
+    }
+  }
+
+  #handleMainToolbarMouseEnter = (): void => {
+    this.#mouseOnMainToolbar = true;
+  };
+
+  #handleMainToolbarMouseLeave = (): void => {
+    this.#mouseOnMainToolbar = false;
+  };
+
+  #addHoverEventListeners(): void {
+    UI.InspectorView.InspectorView.instance().tabbedPane.headerElement().addEventListener(
+        'mouseenter', this.#handleMainToolbarMouseEnter);
+    UI.InspectorView.InspectorView.instance().tabbedPane.headerElement().addEventListener(
+        'mouseleave', this.#handleMainToolbarMouseLeave);
+  }
+
+  #removeHoverEventListeners(): void {
+    UI.InspectorView.InspectorView.instance().tabbedPane.headerElement().removeEventListener(
+        'mouseenter', this.#handleMainToolbarMouseEnter);
+    UI.InspectorView.InspectorView.instance().tabbedPane.headerElement().removeEventListener(
+        'mouseleave', this.#handleMainToolbarMouseLeave);
+  }
+
   // We only want to enable promotion when:
   // * The flag is enabled,
   // * The current date is before the promotion end date,
@@ -90,11 +122,33 @@ export class GlobalAiButton extends UI.Widget.Widget {
   }
 
   #triggerPromotion(): void {
+    // Set up hover listeners for making sure that we don't return to default state from promotion state
+    // when the user's cursor is on the main toolbar.
     this.#buttonState = GlobalAiButtonState.PROMOTION;
     this.requestUpdate();
-    window.setTimeout(() => {
+    this.#addHoverEventListeners();
+    this.#scheduleReturnToDefaultState();
+  }
+
+  #scheduleReturnToDefaultState(): void {
+    if (this.#returnToDefaultStateTimeout) {
+      window.clearTimeout(this.#returnToDefaultStateTimeout);
+    }
+
+    this.#returnToDefaultStateTimeout = window.setTimeout(() => {
+      // If the mouse is currently on the main toolbar,
+      // we don't want to trigger the animation from promotion & to the default
+      // state to not cause a layout shift when the user is not expecting it
+      // (e.g. while they were going to click on a button on the toolbar).
+      if (this.#mouseOnMainToolbar) {
+        this.#scheduleReturnToDefaultState();
+        return;
+      }
+
       this.#buttonState = GlobalAiButtonState.DEFAULT;
       this.requestUpdate();
+      // Remove hover listeners once the button is in its default state.
+      this.#removeHoverEventListeners();
     }, DELAY_BEFORE_PROMOTION_COLLAPSE_IN_MS);
   }
 

front_end/entrypoints/main/GlobalAiButton.ts

@@ -7,7 +7,7 @@
 @scope to (devtools-widget > *) {
   .global-ai-button-container {
     margin-left: var(--sys-size-3);
-    margin-right: var(--sys-size-1);
+    margin-right: var(--sys-size-2);
   }
 
   .global-ai-button {

front_end/entrypoints/main/globalAiButton.css

@@ -7,6 +7,7 @@ export const generatedProperties = [
  {
   "longhands": [
    "max-lines",
+   "block-ellipsis",
    "continue"
   ],
   "name": "-alternative-webkit-line-clamp"
@@ -94,14 +95,12 @@ export const generatedProperties = [
   "name": "-webkit-font-smoothing"
  },
  {
-  "inherited": true,
   "keywords": [
    "auto",
    "loose",
    "normal",
    "strict",
-   "after-white-space",
-   "anywhere"
+   "after-white-space"
   ],
   "name": "-webkit-line-break"
  },
@@ -352,6 +351,7 @@ export const generatedProperties = [
    "base-palette",
    "baseline-shift",
    "baseline-source",
+   "block-ellipsis",
    "block-size",
    "border-block-end-color",
    "border-block-end-style",
@@ -1042,6 +1042,14 @@ export const generatedProperties = [
   ],
   "name": "baseline-source"
  },
+ {
+  "inherited": true,
+  "keywords": [
+   "auto",
+   "no-ellipsis"
+  ],
+  "name": "block-ellipsis"
+ },
  {
   "keywords": [
    "auto"
@@ -2807,13 +2815,15 @@ export const generatedProperties = [
    "loose",
    "normal",
    "strict",
-   "anywhere"
+   "anywhere",
+   "after-white-space"
   ],
   "name": "line-break"
  },
  {
   "longhands": [
    "max-lines",
+   "block-ellipsis",
    "continue"
   ],
   "name": "line-clamp"
@@ -4738,8 +4748,7 @@ export const generatedPropertyValues = {
    "loose",
    "normal",
    "strict",
-   "after-white-space",
-   "anywhere"
+   "after-white-space"
   ]
  },
  "-webkit-line-clamp": {
@@ -4965,6 +4974,12 @@ export const generatedPropertyValues = {
    "last"
   ]
  },
+ "block-ellipsis": {
+  "values": [
+   "auto",
+   "no-ellipsis"
+  ]
+ },
  "block-size": {
   "values": [
    "auto"
@@ -5939,7 +5954,8 @@ export const generatedPropertyValues = {
    "loose",
    "normal",
    "strict",
-   "anywhere"
+   "anywhere",
+   "after-white-space"
   ]
  },
  "line-height": {