Skip to content

Commit e7f525f

Browse files
aeschliaeschli
committed
IIconTheme -> IFileIconTheme
1 parent 79280be commit e7f525f

16 files changed

Lines changed: 96 additions & 106 deletions

File tree

‎src/vs/editor/contrib/suggest/suggestWidget.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,15 @@ class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTemplateD
210210
data.iconContainer.className = 'icon hide';
211211
data.colorspan.style.backgroundColor = color[0];
212212

213-
} else if (suggestion.kind === CompletionItemKind.File && this._themeService.getIconTheme().hasFileIcons) {
213+
} else if (suggestion.kind === CompletionItemKind.File && this._themeService.getFileIconTheme().hasFileIcons) {
214214
// special logic for 'file' completion items
215215
data.icon.className = 'icon hide';
216216
data.iconContainer.className = 'icon hide';
217217
const labelClasses = getIconClasses(this._modelService, this._modeService, URI.from({ scheme: 'fake', path: textLabel }), FileKind.FILE);
218218
const detailClasses = getIconClasses(this._modelService, this._modeService, URI.from({ scheme: 'fake', path: suggestion.detail }), FileKind.FILE);
219219
labelOptions.extraClasses = labelClasses.length > detailClasses.length ? labelClasses : detailClasses;
220220

221-
} else if (suggestion.kind === CompletionItemKind.Folder && this._themeService.getIconTheme().hasFolderIcons) {
221+
} else if (suggestion.kind === CompletionItemKind.Folder && this._themeService.getFileIconTheme().hasFolderIcons) {
222222
// special logic for 'folder' completion items
223223
data.icon.className = 'icon hide';
224224
data.iconContainer.className = 'icon hide';

‎src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { hc_black, vs, vs_dark } from 'vs/editor/standalone/common/themes';
1313
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
1414
import { Registry } from 'vs/platform/registry/common/platform';
1515
import { ColorIdentifier, Extensions, IColorRegistry } from 'vs/platform/theme/common/colorRegistry';
16-
import { Extensions as ThemingExtensions, ICssStyleCollector, IIconTheme, IThemingRegistry, ITokenStyle } from 'vs/platform/theme/common/themeService';
16+
import { Extensions as ThemingExtensions, ICssStyleCollector, IFileIconTheme, IThemingRegistry, ITokenStyle } from 'vs/platform/theme/common/themeService';
1717
import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
1818

1919
const VS_THEME_NAME = 'vs';
@@ -171,8 +171,8 @@ export class StandaloneThemeServiceImpl extends Disposable implements IStandalon
171171
private readonly _onThemeChange = this._register(new Emitter<IStandaloneTheme>());
172172
public readonly onThemeChange = this._onThemeChange.event;
173173

174-
private readonly _onIconThemeChange = this._register(new Emitter<IIconTheme>());
175-
public readonly onIconThemeChange = this._onIconThemeChange.event;
174+
private readonly _onFileIconThemeChange = this._register(new Emitter<IFileIconTheme>());
175+
public readonly onDidFileIconThemeChange = this._onFileIconThemeChange.event;
176176

177177
private readonly _environment: IEnvironmentService = Object.create(null);
178178
private readonly _knownThemes: Map<string, StandaloneTheme>;
@@ -292,7 +292,7 @@ export class StandaloneThemeServiceImpl extends Disposable implements IStandalon
292292
return theme.id;
293293
}
294294

295-
public getIconTheme(): IIconTheme {
295+
public getFileIconTheme(): IFileIconTheme {
296296
return {
297297
hasFileIcons: false,
298298
hasFolderIcons: false,

‎src/vs/editor/standalone/test/browser/standaloneLanguages.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { TokenTheme } from 'vs/editor/common/modes/supports/tokenization';
1212
import { ILineTokens, IToken, TokenizationSupport2Adapter, TokensProvider } from 'vs/editor/standalone/browser/standaloneLanguages';
1313
import { IStandaloneTheme, IStandaloneThemeData, IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneThemeService';
1414
import { ColorIdentifier } from 'vs/platform/theme/common/colorRegistry';
15-
import { IIconTheme, ITheme, LIGHT, ITokenStyle } from 'vs/platform/theme/common/themeService';
15+
import { IFileIconTheme, ITheme, LIGHT, ITokenStyle } from 'vs/platform/theme/common/themeService';
1616

1717
suite('TokenizationSupport2Adapter', () => {
1818

@@ -64,15 +64,15 @@ suite('TokenizationSupport2Adapter', () => {
6464
};
6565
}
6666

67-
public getIconTheme(): IIconTheme {
67+
public getFileIconTheme(): IFileIconTheme {
6868
return {
6969
hasFileIcons: false,
7070
hasFolderIcons: false,
7171
hidesExplorerArrows: false
7272
};
7373
}
7474
public readonly onThemeChange = new Emitter<ITheme>().event;
75-
public readonly onIconThemeChange = new Emitter<IIconTheme>().event;
75+
public readonly onDidFileIconThemeChange = new Emitter<IFileIconTheme>().event;
7676
}
7777

7878
class MockState implements IState {

‎src/vs/platform/theme/common/themeService.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export interface ITheme {
114114
readonly tokenColorMap: string[];
115115
}
116116

117-
export interface IIconTheme {
117+
export interface IFileIconTheme {
118118
readonly hasFileIcons: boolean;
119119
readonly hasFolderIcons: boolean;
120120
readonly hidesExplorerArrows: boolean;
@@ -135,9 +135,9 @@ export interface IThemeService {
135135

136136
readonly onThemeChange: Event<ITheme>;
137137

138-
getIconTheme(): IIconTheme;
138+
getFileIconTheme(): IFileIconTheme;
139139

140-
readonly onIconThemeChange: Event<IIconTheme>;
140+
readonly onDidFileIconThemeChange: Event<IFileIconTheme>;
141141

142142
}
143143

‎src/vs/platform/theme/test/common/testThemeService.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { Event, Emitter } from 'vs/base/common/event';
7-
import { IThemeService, ITheme, DARK, IIconTheme, ITokenStyle } from 'vs/platform/theme/common/themeService';
7+
import { IThemeService, ITheme, DARK, IFileIconTheme, ITokenStyle } from 'vs/platform/theme/common/themeService';
88
import { Color } from 'vs/base/common/color';
99

1010
export class TestTheme implements ITheme {
@@ -33,7 +33,7 @@ export class TestTheme implements ITheme {
3333
}
3434
}
3535

36-
export class TestIconTheme implements IIconTheme {
36+
export class TestFileIconTheme implements IFileIconTheme {
3737
hasFileIcons = false;
3838
hasFolderIcons = false;
3939
hidesExplorerArrows = false;
@@ -42,38 +42,38 @@ export class TestIconTheme implements IIconTheme {
4242
export class TestThemeService implements IThemeService {
4343

4444
_serviceBrand: undefined;
45-
_theme: ITheme;
46-
_iconTheme: IIconTheme;
45+
_colorTheme: ITheme;
46+
_fileIconTheme: IFileIconTheme;
4747
_onThemeChange = new Emitter<ITheme>();
48-
_onIconThemeChange = new Emitter<IIconTheme>();
48+
_onFileIconThemeChange = new Emitter<IFileIconTheme>();
4949

50-
constructor(theme = new TestTheme(), iconTheme = new TestIconTheme()) {
51-
this._theme = theme;
52-
this._iconTheme = iconTheme;
50+
constructor(theme = new TestTheme(), iconTheme = new TestFileIconTheme()) {
51+
this._colorTheme = theme;
52+
this._fileIconTheme = iconTheme;
5353
}
5454

5555
getTheme(): ITheme {
56-
return this._theme;
56+
return this._colorTheme;
5757
}
5858

5959
setTheme(theme: ITheme) {
60-
this._theme = theme;
60+
this._colorTheme = theme;
6161
this.fireThemeChange();
6262
}
6363

6464
fireThemeChange() {
65-
this._onThemeChange.fire(this._theme);
65+
this._onThemeChange.fire(this._colorTheme);
6666
}
6767

6868
public get onThemeChange(): Event<ITheme> {
6969
return this._onThemeChange.event;
7070
}
7171

72-
getIconTheme(): IIconTheme {
73-
return this._iconTheme;
72+
getFileIconTheme(): IFileIconTheme {
73+
return this._fileIconTheme;
7474
}
7575

76-
public get onIconThemeChange(): Event<IIconTheme> {
77-
return this._onIconThemeChange.event;
76+
public get onDidFileIconThemeChange(): Event<IFileIconTheme> {
77+
return this._onFileIconThemeChange.event;
7878
}
7979
}

‎src/vs/workbench/browser/parts/editor/breadcrumbsPicker.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder } from 'vs/platf
2424
import { ResourceLabels, IResourceLabel, DEFAULT_LABELS_CONTAINER } from 'vs/workbench/browser/labels';
2525
import { BreadcrumbsConfig } from 'vs/workbench/browser/parts/editor/breadcrumbs';
2626
import { BreadcrumbElement, FileElement } from 'vs/workbench/browser/parts/editor/breadcrumbsModel';
27-
import { IFileIconTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
27+
2828
import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeFilter, TreeVisibility, ITreeSorter } from 'vs/base/browser/ui/tree/tree';
2929
import { OutlineVirtualDelegate, OutlineGroupRenderer, OutlineElementRenderer, OutlineItemComparator, OutlineIdentityProvider, OutlineNavigationLabelProvider, OutlineDataSource, OutlineSortOrder, OutlineFilter } from 'vs/editor/contrib/documentSymbols/outlineTree';
3030
import { IIdentityProvider, IListVirtualDelegate, IKeyboardNavigationLabelProvider } from 'vs/base/browser/ui/list/list';
31+
import { IFileIconTheme, IThemeService } from 'vs/platform/theme/common/themeService';
3132

3233
export function createBreadcrumbsPicker(instantiationService: IInstantiationService, parent: HTMLElement, element: BreadcrumbElement): BreadcrumbsPicker {
3334
return element instanceof FileElement
@@ -69,7 +70,7 @@ export abstract class BreadcrumbsPicker {
6970
constructor(
7071
parent: HTMLElement,
7172
@IInstantiationService protected readonly _instantiationService: IInstantiationService,
72-
@IWorkbenchThemeService protected readonly _themeService: IWorkbenchThemeService,
73+
@IThemeService protected readonly _themeService: IThemeService,
7374
@IConfigurationService protected readonly _configurationService: IConfigurationService,
7475
) {
7576
this._domNode = document.createElement('div');
@@ -351,7 +352,7 @@ export class BreadcrumbsFilePicker extends BreadcrumbsPicker {
351352
constructor(
352353
parent: HTMLElement,
353354
@IInstantiationService instantiationService: IInstantiationService,
354-
@IWorkbenchThemeService themeService: IWorkbenchThemeService,
355+
@IThemeService themeService: IThemeService,
355356
@IConfigurationService configService: IConfigurationService,
356357
@IWorkspaceContextService private readonly _workspaceService: IWorkspaceContextService,
357358
) {
@@ -433,7 +434,7 @@ export class BreadcrumbsOutlinePicker extends BreadcrumbsPicker {
433434
constructor(
434435
parent: HTMLElement,
435436
@IInstantiationService instantiationService: IInstantiationService,
436-
@IWorkbenchThemeService themeService: IWorkbenchThemeService,
437+
@IThemeService themeService: IThemeService,
437438
@IConfigurationService configurationService: IConfigurationService,
438439
) {
439440
super(parent, instantiationService, themeService, configurationService);

‎src/vs/workbench/browser/parts/views/customView.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
1919
import { INotificationService } from 'vs/platform/notification/common/notification';
2020
import { IProgressService } from 'vs/platform/progress/common/progress';
2121
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
22-
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
2322
import { ICommandService } from 'vs/platform/commands/common/commands';
2423
import * as DOM from 'vs/base/browser/dom';
2524
import { ResourceLabels, IResourceLabel } from 'vs/workbench/browser/labels';
@@ -166,7 +165,7 @@ export class CustomTreeView extends Disposable implements ITreeView {
166165
private id: string,
167166
private _title: string,
168167
@IExtensionService private readonly extensionService: IExtensionService,
169-
@IWorkbenchThemeService private readonly themeService: IWorkbenchThemeService,
168+
@IThemeService private readonly themeService: IThemeService,
170169
@IInstantiationService private readonly instantiationService: IInstantiationService,
171170
@ICommandService private readonly commandService: ICommandService,
172171
@IConfigurationService private readonly configurationService: IConfigurationService,
@@ -697,7 +696,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
697696
private labels: ResourceLabels,
698697
private actionViewItemProvider: IActionViewItemProvider,
699698
private aligner: Aligner,
700-
@IWorkbenchThemeService private readonly themeService: IWorkbenchThemeService,
699+
@IThemeService private readonly themeService: IThemeService,
701700
@IConfigurationService private readonly configurationService: IConfigurationService,
702701
@ILabelService private readonly labelService: ILabelService
703702
) {
@@ -826,7 +825,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
826825
class Aligner extends Disposable {
827826
private _tree: WorkbenchAsyncDataTree<ITreeItem, ITreeItem, FuzzyScore> | undefined;
828827

829-
constructor(private themeService: IWorkbenchThemeService) {
828+
constructor(private themeService: IThemeService) {
830829
super();
831830
}
832831

‎src/vs/workbench/browser/parts/views/views.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/act
1717
import { localize } from 'vs/nls';
1818
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
1919
import { values } from 'vs/base/common/map';
20-
import { IFileIconTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
2120
import { toggleClass, addClass } from 'vs/base/browser/dom';
2221
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
2322
import { IPaneComposite } from 'vs/workbench/common/panecomposite';
@@ -27,7 +26,7 @@ import { VIEW_ID as SEARCH_VIEW_ID } from 'vs/workbench/services/search/common/s
2726
import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
2827
import { PaneCompositePanel, PanelRegistry, PanelDescriptor, Extensions as PanelExtensions } from 'vs/workbench/browser/panel';
2928
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
30-
import { IThemeService } from 'vs/platform/theme/common/themeService';
29+
import { IThemeService, IFileIconTheme } from 'vs/platform/theme/common/themeService';
3130
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
3231
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
3332
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
@@ -701,7 +700,7 @@ export class ViewsService extends Disposable implements IViewsService {
701700
}
702701
}
703702

704-
export function createFileIconThemableTreeContainerScope(container: HTMLElement, themeService: IWorkbenchThemeService): IDisposable {
703+
export function createFileIconThemableTreeContainerScope(container: HTMLElement, themeService: IThemeService): IDisposable {
705704
addClass(container, 'file-icon-themable-tree');
706705
addClass(container, 'show-file-icons');
707706

‎src/vs/workbench/browser/parts/views/viewsViewlet.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
99
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
1010
import { IViewDescriptor, IViewDescriptorService } from 'vs/workbench/common/views';
1111
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
12-
import { IThemeService } from 'vs/platform/theme/common/themeService';
12+
import { IThemeService, IFileIconTheme } from 'vs/platform/theme/common/themeService';
1313
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1414
import { IStorageService } from 'vs/platform/storage/common/storage';
1515
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
1616
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
1717
import { ViewPaneContainer, ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer';
1818
import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
19-
import { IWorkbenchThemeService, IFileIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
2019
import { ITreeConfiguration, ITreeOptions } from 'vs/base/parts/tree/browser/tree';
2120
import { Event } from 'vs/base/common/event';
2221
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -155,7 +154,7 @@ export class FileIconThemableWorkbenchTree extends WorkbenchTree {
155154
options: ITreeOptions,
156155
@IContextKeyService contextKeyService: IContextKeyService,
157156
@IListService listService: IListService,
158-
@IThemeService themeService: IWorkbenchThemeService,
157+
@IThemeService themeService: IThemeService,
159158
@IConfigurationService configurationService: IConfigurationService,
160159
@IInstantiationService instantiationService: IInstantiationService
161160
) {

‎src/vs/workbench/contrib/extensions/browser/extensionsActions.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
5252
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
5353
import { alert } from 'vs/base/browser/ui/aria/aria';
5454
import { coalesce } from 'vs/base/common/arrays';
55-
import { IWorkbenchThemeService, COLOR_THEME_SETTING, ICON_THEME_SETTING, IFileIconTheme, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
55+
import { IWorkbenchThemeService, COLOR_THEME_SETTING, ICON_THEME_SETTING, IWorkbenchFileIconTheme, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
5656
import { ILabelService } from 'vs/platform/label/common/label';
5757
import { prefersExecuteOnUI, prefersExecuteOnWorkspace } from 'vs/workbench/services/extensions/common/extensionsUtil';
5858
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
@@ -699,7 +699,7 @@ export class ManageExtensionAction extends ExtensionDropDownAction {
699699
this.update();
700700
}
701701

702-
getActionGroups(runningExtensions: IExtensionDescription[], colorThemes: IColorTheme[], fileIconThemes: IFileIconTheme[]): IAction[][] {
702+
getActionGroups(runningExtensions: IExtensionDescription[], colorThemes: IColorTheme[], fileIconThemes: IWorkbenchFileIconTheme[]): IAction[][] {
703703
const groups: ExtensionAction[][] = [];
704704
if (this.extension) {
705705
const extensionColorThemes = SetColorThemeAction.getColorThemes(colorThemes, this.extension);
@@ -1368,12 +1368,12 @@ export class SetFileIconThemeAction extends ExtensionAction {
13681368
private static readonly DisabledClass = `${SetFileIconThemeAction.EnabledClass} disabled`;
13691369

13701370

1371-
static getFileIconThemes(fileIconThemes: IFileIconTheme[], extension: IExtension): IFileIconTheme[] {
1371+
static getFileIconThemes(fileIconThemes: IWorkbenchFileIconTheme[], extension: IExtension): IWorkbenchFileIconTheme[] {
13721372
return fileIconThemes.filter(c => c.extensionData && ExtensionIdentifier.equals(c.extensionData.extensionId, extension.identifier.id));
13731373
}
13741374

13751375
constructor(
1376-
private readonly fileIconThemes: IFileIconTheme[],
1376+
private readonly fileIconThemes: IWorkbenchFileIconTheme[],
13771377
@IExtensionService extensionService: IExtensionService,
13781378
@IWorkbenchThemeService private readonly workbenchThemeService: IWorkbenchThemeService,
13791379
@IQuickInputService private readonly quickInputService: IQuickInputService,

0 commit comments

Comments
 (0)