[AI Assistance] Fix AI Assistance not finding automatic filesystems

OrKoN · Devtools-frontend LUCI CQ · commit 121bd31fbd86 · 2025-02-26T06:32:26.000-08:00
It also refactors the filesystem type to be enums and automated filesystems to have a flag on them. Fixed: 399333674 Change-Id: Ide6c6ce966177590be5cca1a1637c04b983c6d13 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6305500 Reviewed-by: Benedikt Meurer <bmeurer@chromium.org> Commit-Queue: Alex Rudenko <alexrudenko@chromium.org>
diff --git a/front_end/core/host/InspectorFrontendHost.ts b/front_end/core/host/InspectorFrontendHost.ts
@@ -294,7 +294,7 @@ export class InspectorFrontendHostStub implements InspectorFrontendHostAPI {
         fileSystemName: 'sandboxedRequestedFileSystem',
         fileSystemPath: OVERRIDES_FILE_SYSTEM_PATH,
         rootURL: 'filesystem:devtools://devtools/isolated/',
-        type: 'overrides',
+        type: 'overrides' as const,
       };
       this.events.dispatchEventToListeners(Events.FileSystemAdded, {fileSystem});
     };
diff --git a/front_end/core/host/InspectorFrontendHostAPI.ts b/front_end/core/host/InspectorFrontendHostAPI.ts
@@ -82,7 +82,7 @@ export interface EyeDropperPickedColorEvent {
 }
 
 export interface DevToolsFileSystem {
-  type: string;
+  type: ''|'automatic'|'snippets'|'overrides';
   fileSystemName: string;
   rootURL: string;
   fileSystemPath: Platform.DevToolsPath.RawPathString;
diff --git a/front_end/models/breakpoints/BreakpointManager.test.ts b/front_end/models/breakpoints/BreakpointManager.test.ts
@@ -883,7 +883,7 @@ describeWithMockConnection('BreakpointManager', () => {
 
     async function testBreakpointMovedOnInstrumentationBreak(
         fileSystemPath: Platform.DevToolsPath.UrlString, fileSystemFileUrl: Platform.DevToolsPath.UrlString,
-        content: string, type?: string) {
+        content: string, type?: Persistence.PlatformFileSystem.PlatformFileSystemType) {
       const debuggerModel = target.model(SDK.DebuggerModel.DebuggerModel);
       assert.exists(debuggerModel);
 
@@ -1480,10 +1480,10 @@ describeWithMockConnection('BreakpointManager', () => {
 
       const fileSystemPath = urlString`file://path/to/overrides`;
       const fielSystemFileUrl = urlString`${fileSystemPath + '/site/script.js'}`;
-      const type = 'overrides';
       const content = '';
 
-      await testBreakpointMovedOnInstrumentationBreak(fileSystemPath, fielSystemFileUrl, content, type);
+      await testBreakpointMovedOnInstrumentationBreak(
+          fileSystemPath, fielSystemFileUrl, content, Persistence.PlatformFileSystem.PlatformFileSystemType.OVERRIDES);
     });
   });
 
diff --git a/front_end/models/persistence/IsolatedFileSystem.ts b/front_end/models/persistence/IsolatedFileSystem.ts
@@ -35,7 +35,7 @@ import * as Platform from '../../core/platform/platform.js';
 import * as TextUtils from '../text_utils/text_utils.js';
 
 import {Events, type IsolatedFileSystemManager} from './IsolatedFileSystemManager.js';
-import {PlatformFileSystem} from './PlatformFileSystem.js';
+import {PlatformFileSystem, type PlatformFileSystemType} from './PlatformFileSystem.js';
 
 const UIStrings = {
   /**
@@ -75,8 +75,9 @@ export class IsolatedFileSystem extends PlatformFileSystem {
 
   constructor(
       manager: IsolatedFileSystemManager, path: Platform.DevToolsPath.UrlString,
-      embedderPath: Platform.DevToolsPath.RawPathString, domFileSystem: FileSystem, type: string) {
-    super(path, type);
+      embedderPath: Platform.DevToolsPath.RawPathString, domFileSystem: FileSystem, type: PlatformFileSystemType,
+      automatic: boolean) {
+    super(path, type, automatic);
     this.manager = manager;
     this.embedderPathInternal = embedderPath;
     this.domFileSystem = domFileSystem;
@@ -87,14 +88,14 @@ export class IsolatedFileSystem extends PlatformFileSystem {
 
   static async create(
       manager: IsolatedFileSystemManager, path: Platform.DevToolsPath.UrlString,
-      embedderPath: Platform.DevToolsPath.RawPathString, type: string, name: string,
-      rootURL: string): Promise<IsolatedFileSystem|null> {
+      embedderPath: Platform.DevToolsPath.RawPathString, type: PlatformFileSystemType, name: string, rootURL: string,
+      automatic: boolean): Promise<IsolatedFileSystem|null> {
     const domFileSystem = Host.InspectorFrontendHost.InspectorFrontendHostInstance.isolatedFileSystem(name, rootURL);
     if (!domFileSystem) {
       return null;
     }
 
-    const fileSystem = new IsolatedFileSystem(manager, path, embedderPath, domFileSystem, type);
+    const fileSystem = new IsolatedFileSystem(manager, path, embedderPath, domFileSystem, type, automatic);
     return await fileSystem.initializeFilePaths().then(() => fileSystem).catch(error => {
       console.error(error);
       return null;
diff --git a/front_end/models/persistence/IsolatedFileSystemManager.ts b/front_end/models/persistence/IsolatedFileSystemManager.ts
@@ -35,7 +35,7 @@ import * as Platform from '../../core/platform/platform.js';
 
 import type {FilesChangedData} from './FileSystemWorkspaceBinding.js';
 import {IsolatedFileSystem} from './IsolatedFileSystem.js';
-import type {PlatformFileSystem} from './PlatformFileSystem.js';
+import {type PlatformFileSystem, PlatformFileSystemType} from './PlatformFileSystem.js';
 
 const UIStrings = {
   /**
@@ -180,7 +180,8 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     const embedderPath = fileSystem.fileSystemPath;
     const fileSystemURL = Common.ParsedURL.ParsedURL.rawPathToUrlString(fileSystem.fileSystemPath);
     const promise = IsolatedFileSystem.create(
-        this, fileSystemURL, embedderPath, fileSystem.type, fileSystem.fileSystemName, fileSystem.rootURL);
+        this, fileSystemURL, embedderPath, hostFileSystemTypeToPlatformFileSystemType(fileSystem.type),
+        fileSystem.fileSystemName, fileSystem.rootURL, fileSystem.type === 'automatic');
     return promise.then(storeFileSystem.bind(this));
 
     function storeFileSystem(this: IsolatedFileSystemManager, fileSystem: IsolatedFileSystem|null): IsolatedFileSystem|
@@ -359,3 +360,14 @@ export interface EventTypes {
 }
 
 let lastRequestId = 0;
+
+function hostFileSystemTypeToPlatformFileSystemType(type: string): PlatformFileSystemType {
+  switch (type) {
+    case 'snippets':
+      return PlatformFileSystemType.SNIPPETS;
+    case 'overrides':
+      return PlatformFileSystemType.OVERRIDES;
+    default:
+      return PlatformFileSystemType.DISK;
+  }
+}
diff --git a/front_end/models/persistence/PersistenceImpl.test.ts b/front_end/models/persistence/PersistenceImpl.test.ts
@@ -115,7 +115,8 @@ describeWithMockConnection('PersistenceImpl', () => {
     const fileSystemPath = urlString`file://path/to/filesystem`;
     const fileSystemFileUrl = urlString`${fileSystemPath + '/script.js'}`;
     const {uiSourceCode: fileSystemUiSourceCode, project} = createFileSystemFileForPersistenceTests(
-        {fileSystemPath, fileSystemFileUrl, type: ''}, SCRIPT_DESCRIPTION.url, SCRIPT_DESCRIPTION.content, target);
+        {fileSystemPath, fileSystemFileUrl, type: Persistence.PlatformFileSystem.PlatformFileSystemType.DISK},
+        SCRIPT_DESCRIPTION.url, SCRIPT_DESCRIPTION.content, target);
     const breakpointLine = 0;
 
     // Set the breakpoint response for our upcoming request.
@@ -140,7 +141,8 @@ describeWithMockConnection('PersistenceImpl', () => {
        const fileSystemPath = urlString`file://path/to/filesystem`;
        const fileSystemFileUrl = urlString`${fileSystemPath + '/script.js'}`;
        const {uiSourceCode: fileSystemUiSourceCode, project} = createFileSystemFileForPersistenceTests(
-           {fileSystemPath, fileSystemFileUrl, type: ''}, SCRIPT_DESCRIPTION.url, SCRIPT_DESCRIPTION.content, target);
+           {fileSystemPath, fileSystemFileUrl, type: Persistence.PlatformFileSystem.PlatformFileSystemType.DISK},
+           SCRIPT_DESCRIPTION.url, SCRIPT_DESCRIPTION.content, target);
        const breakpointLine = 0;
 
        // Set the breakpoint response for our upcoming request.
diff --git a/front_end/models/persistence/PlatformFileSystem.test.ts b/front_end/models/persistence/PlatformFileSystem.test.ts
@@ -9,10 +9,11 @@ const {urlString} = Platform.DevToolsPath;
 
 describe('PlatformFileSystem', () => {
   it('can be instantiated successfully', () => {
-    const platformFileSystem = new Persistence.PlatformFileSystem.PlatformFileSystem(urlString`Test Path`, 'Test Type');
+    const platformFileSystem = new Persistence.PlatformFileSystem.PlatformFileSystem(
+        urlString`Test Path`, Persistence.PlatformFileSystem.PlatformFileSystemType.DISK, false);
     assert.strictEqual(platformFileSystem.path(), 'Test Path', 'path was not set or retrieved correctly');
-    assert.strictEqual(platformFileSystem.type(), 'Test Type', 'Type was not set or retrieved correctly');
+    assert.strictEqual(
+        platformFileSystem.type(), Persistence.PlatformFileSystem.PlatformFileSystemType.DISK,
+        'Type was not set or retrieved correctly');
   });
-
-  // TODO continue writing tests here or use another describe block
 });
diff --git a/front_end/models/persistence/PlatformFileSystem.ts b/front_end/models/persistence/PlatformFileSystem.ts
@@ -15,12 +15,21 @@ const UIStrings = {
 } as const;
 const str_ = i18n.i18n.registerUIStrings('models/persistence/PlatformFileSystem.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
+
+export enum PlatformFileSystemType {
+  SNIPPETS = 'snippets',
+  OVERRIDES = 'overrides',
+  DISK = 'disk',
+}
+
 export class PlatformFileSystem {
   private readonly pathInternal: Platform.DevToolsPath.UrlString;
-  private readonly typeInternal: string;
-  constructor(path: Platform.DevToolsPath.UrlString, type: string) {
+  #type: PlatformFileSystemType;
+  #automatic: boolean;
+  constructor(path: Platform.DevToolsPath.UrlString, type: PlatformFileSystemType, automatic: boolean) {
     this.pathInternal = path;
-    this.typeInternal = type;
+    this.#type = type;
+    this.#automatic = automatic;
   }
 
   getMetadata(_path: Platform.DevToolsPath.EncodedPathString): Promise<{modificationTime: Date, size: number}|null> {
@@ -44,8 +53,11 @@ export class PlatformFileSystem {
   }
 
   type(): string {
-    // TODO(kozyatinskiy): remove type, overrides should implement this interface.
-    return this.typeInternal;
+    return this.#type;
+  }
+
+  automatic(): boolean {
+    return this.#automatic;
   }
 
   async createFile(_path: Platform.DevToolsPath.EncodedPathString, _name: Platform.DevToolsPath.RawPathString|null):
diff --git a/front_end/panels/ai_assistance/AiAssistancePanel.ts b/front_end/panels/ai_assistance/AiAssistancePanel.ts
@@ -487,9 +487,7 @@ export class AiAssistancePanel extends UI.Panel.Panel {
         if (!(project instanceof Persistence.FileSystemWorkspaceBinding.FileSystem)) {
           continue;
         }
-        // Workspace projects do not have a type. Only snippets and
-        // overrides do.
-        if (project.fileSystem().type()) {
+        if (project.fileSystem().type() !== Persistence.PlatformFileSystem.PlatformFileSystemType.DISK) {
           continue;
         }
         this.#project = project;
diff --git a/front_end/panels/snippets/ScriptSnippetFileSystem.ts b/front_end/panels/snippets/ScriptSnippetFileSystem.ts
@@ -39,7 +39,9 @@ export class SnippetFileSystem extends Persistence.PlatformFileSystem.PlatformFi
   private readonly lastSnippetIdentifierSetting: Common.Settings.Setting<number>;
   private readonly snippetsSetting: Common.Settings.Setting<Snippet[]>;
   constructor() {
-    super('snippet://' as Platform.DevToolsPath.UrlString, 'snippets');
+    super(
+        'snippet://' as Platform.DevToolsPath.UrlString, Persistence.PlatformFileSystem.PlatformFileSystemType.SNIPPETS,
+        false);
     this.lastSnippetIdentifierSetting =
         Common.Settings.Settings.instance().createSetting('script-snippets-last-identifier', 0);
     this.snippetsSetting = Common.Settings.Settings.instance().createSetting('script-snippets', []);
diff --git a/front_end/panels/sources/SourcesView.test.ts b/front_end/panels/sources/SourcesView.test.ts
@@ -193,7 +193,7 @@ describeWithMockConnection('SourcesView', () => {
     createFileSystemUISourceCode({
       url: urlString`snippet:///foo.js`,
       mimeType: 'application/javascript',
-      type: 'snippets',
+      type: Persistence.PlatformFileSystem.PlatformFileSystemType.SNIPPETS,
     });
 
     const sourcesView = new Sources.SourcesView.SourcesView();
diff --git a/front_end/testing/PersistenceHelpers.ts b/front_end/testing/PersistenceHelpers.ts
@@ -22,7 +22,7 @@ export function createFileSystemFileForPersistenceTests(
     fileSystemScript: {
       fileSystemFileUrl: Platform.DevToolsPath.UrlString,
       fileSystemPath: Platform.DevToolsPath.UrlString,
-      type?: string,
+      type?: Persistence.PlatformFileSystem.PlatformFileSystemType,
     },
     networkScriptUrl: Platform.DevToolsPath.UrlString, content: string, target: SDK.Target.Target):
     {uiSourceCode: Workspace.UISourceCode.UISourceCode, project: Persistence.FileSystemWorkspaceBinding.FileSystem} {
diff --git a/front_end/testing/UISourceCodeHelpers.ts b/front_end/testing/UISourceCodeHelpers.ts
@@ -71,8 +71,10 @@ class TestPlatformFileSystem extends Persistence.PlatformFileSystem.PlatformFile
   readonly #mimeType: string;
   readonly #autoMapping: boolean;
 
-  constructor(path: Platform.DevToolsPath.UrlString, type: string, mimeType: string, autoMapping: boolean) {
-    super(path, type);
+  constructor(
+      path: Platform.DevToolsPath.UrlString, type: Persistence.PlatformFileSystem.PlatformFileSystemType,
+      mimeType: string, autoMapping: boolean) {
+    super(path, type, false);
     this.#mimeType = mimeType;
     this.#autoMapping = autoMapping;
   }
@@ -117,7 +119,7 @@ export function createFileSystemUISourceCode(options: {
   content?: string,
   fileSystemPath?: string,
   autoMapping?: boolean,
-  type?: string,
+  type?: Persistence.PlatformFileSystem.PlatformFileSystemType,
   metadata?: Workspace.UISourceCode.UISourceCodeMetadata,
 }): {uiSourceCode: Workspace.UISourceCode.UISourceCode, project: Persistence.FileSystemWorkspaceBinding.FileSystem} {
   const workspace = Workspace.Workspace.WorkspaceImpl.instance();
@@ -127,8 +129,9 @@ export function createFileSystemUISourceCode(options: {
   const fileSystemPath = urlString`${options.fileSystemPath || ''}`;
   const type = options.type || '';
   const content = options.content || '';
-  const platformFileSystem =
-      new TestPlatformFileSystem(fileSystemPath, type, options.mimeType, Boolean(options.autoMapping));
+  const platformFileSystem = new TestPlatformFileSystem(
+      fileSystemPath, type || Persistence.PlatformFileSystem.PlatformFileSystemType.DISK, options.mimeType,
+      Boolean(options.autoMapping));
   const metadata = options.metadata || new Workspace.UISourceCode.UISourceCodeMetadata(null, null);
 
   const project = new TestFileSystem({fileSystemWorkspaceBinding, platformFileSystem, workspace, content, metadata});

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ export interface EyeDropperPickedColorEvent {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`export interface DevToolsFileSystem {`
`85`		`- type: string;`
	`85`	`+ type: ''\|'automatic'\|'snippets'\|'overrides';`
`86`	`86`	`fileSystemName: string;`
`87`	`87`	`rootURL: string;`
`88`	`88`	`fileSystemPath: Platform.DevToolsPath.RawPathString;`
Original file line number	Diff line number	Diff line change
`@@ -487,9 +487,7 @@ export class AiAssistancePanel extends UI.Panel.Panel {`
`487`	`487`	`if (!(project instanceof Persistence.FileSystemWorkspaceBinding.FileSystem)) {`
`488`	`488`	`continue;`
`489`	`489`	`}`
`490`		`- // Workspace projects do not have a type. Only snippets and`
`491`		`- // overrides do.`
`492`		`- if (project.fileSystem().type()) {`
	`490`	`+ if (project.fileSystem().type() !== Persistence.PlatformFileSystem.PlatformFileSystemType.DISK) {`
`493`	`491`	`continue;`
`494`	`492`	`}`
`495`	`493`	`this.#project = project;`