Skip to content

Commit 114cac7

Browse files
Samiya CaurDevtools-frontend LUCI CQ
authored andcommitted
Use getIconForSourceFile to use IconForFileSource component for icons in sources panel
Bug: 371947238 Change-Id: I5c91a507fb4919eb407d4cdb373b447bb64a84ae Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/5923303 Reviewed-by: Ergün Erdoğmuş <[email protected]> Commit-Queue: Samiya Caur <[email protected]>
1 parent a70dc9e commit 114cac7

File tree

3 files changed

+4
-24
lines changed

3 files changed

+4
-24
lines changed

front_end/panels/sources/BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ devtools_module("sources") {
9292
"../../ui/legacy/components/source_frame:bundle",
9393
"../../ui/legacy/components/utils:bundle",
9494
"../../ui/visual_logging:bundle",
95+
"../utils:bundle",
9596
"./components:bundle",
9697
]
9798
}

front_end/panels/sources/NavigatorView.ts

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import * as IconButton from '../../ui/components/icon_button/icon_button.js';
4242
import * as UI from '../../ui/legacy/legacy.js';
4343
import * as VisualLogging from '../../ui/visual_logging/visual_logging.js';
4444
import * as Snippets from '../snippets/snippets.js';
45+
import {PanelUtils} from '../utils/utils.js';
4546

4647
import navigatorTreeStyles from './navigatorTree.css.js';
4748
import navigatorViewStyles from './navigatorView.css.js';
@@ -1397,29 +1398,7 @@ export class NavigatorSourceTreeElement extends UI.TreeOutline.TreeElement {
13971398
}
13981399

13991400
updateIcon(): void {
1400-
const binding = Persistence.Persistence.PersistenceImpl.instance().binding(this.uiSourceCodeInternal);
1401-
const networkPersistenceManager = Persistence.NetworkPersistenceManager.NetworkPersistenceManager.instance();
1402-
let iconType = 'document';
1403-
let iconStyles: string[] = [];
1404-
if (binding) {
1405-
if (Snippets.ScriptSnippetFileSystem.isSnippetsUISourceCode(binding.fileSystem)) {
1406-
iconType = 'snippet';
1407-
}
1408-
const badgeIsPurple = networkPersistenceManager.project() === binding.fileSystem.project();
1409-
iconStyles = badgeIsPurple ? ['dot', 'purple'] : ['dot', 'green'];
1410-
} else if (networkPersistenceManager.isActiveHeaderOverrides(this.uiSourceCode)) {
1411-
iconStyles = ['dot', 'purple'];
1412-
} else {
1413-
if (Snippets.ScriptSnippetFileSystem.isSnippetsUISourceCode(this.uiSourceCodeInternal)) {
1414-
iconType = 'snippet';
1415-
}
1416-
}
1417-
1418-
const icon = IconButton.Icon.create(iconType, iconStyles.join(' '));
1419-
if (binding) {
1420-
UI.Tooltip.Tooltip.install(
1421-
icon, Persistence.PersistenceUtils.PersistenceUtils.tooltipForUISourceCode(this.uiSourceCodeInternal));
1422-
}
1401+
const icon = PanelUtils.getIconForSourceFile(this.uiSourceCodeInternal);
14231402
this.setLeadingIcons([icon]);
14241403
}
14251404

front_end/ui/legacy/Treeoutline.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,7 @@ export class TreeElement {
801801
}
802802
}
803803

804-
setLeadingIcons(icons: IconButton.Icon.Icon[]): void {
804+
setLeadingIcons(icons: IconButton.Icon.Icon[]|IconButton.FileSourceIcon.FileSourceIcon[]): void {
805805
if (!this.leadingIconsElement && !icons.length) {
806806
return;
807807
}

0 commit comments

Comments
 (0)