Merge from vscode cfc1ab4c5f816765b91fb7ead3c3427a7c8581a3

This commit is contained in:
ADS Merger
2020-03-11 04:19:23 +00:00
parent 16fab722d5
commit 4c3e48773d
880 changed files with 20441 additions and 11232 deletions

View File

@@ -4,10 +4,10 @@
*--------------------------------------------------------------------------------------------*/
import { Event, Emitter } from 'vs/base/common/event';
import { IThemeService, ITheme, DARK, IIconTheme, ITokenStyle } from 'vs/platform/theme/common/themeService';
import { IThemeService, IColorTheme, DARK, IFileIconTheme, ITokenStyle } from 'vs/platform/theme/common/themeService';
import { Color } from 'vs/base/common/color';
export class TestTheme implements ITheme {
export class TestColorTheme implements IColorTheme {
constructor(private colors: { [id: string]: string; } = {}, public type = DARK) {
}
@@ -33,7 +33,7 @@ export class TestTheme implements ITheme {
}
}
export class TestIconTheme implements IIconTheme {
export class TestFileIconTheme implements IFileIconTheme {
hasFileIcons = false;
hasFolderIcons = false;
hidesExplorerArrows = false;
@@ -42,38 +42,38 @@ export class TestIconTheme implements IIconTheme {
export class TestThemeService implements IThemeService {
_serviceBrand: undefined;
_theme: ITheme;
_iconTheme: IIconTheme;
_onThemeChange = new Emitter<ITheme>();
_onIconThemeChange = new Emitter<IIconTheme>();
_colorTheme: IColorTheme;
_fileIconTheme: IFileIconTheme;
_onThemeChange = new Emitter<IColorTheme>();
_onFileIconThemeChange = new Emitter<IFileIconTheme>();
constructor(theme = new TestTheme(), iconTheme = new TestIconTheme()) {
this._theme = theme;
this._iconTheme = iconTheme;
constructor(theme = new TestColorTheme(), iconTheme = new TestFileIconTheme()) {
this._colorTheme = theme;
this._fileIconTheme = iconTheme;
}
getTheme(): ITheme {
return this._theme;
getColorTheme(): IColorTheme {
return this._colorTheme;
}
setTheme(theme: ITheme) {
this._theme = theme;
setTheme(theme: IColorTheme) {
this._colorTheme = theme;
this.fireThemeChange();
}
fireThemeChange() {
this._onThemeChange.fire(this._theme);
this._onThemeChange.fire(this._colorTheme);
}
public get onThemeChange(): Event<ITheme> {
public get onDidColorThemeChange(): Event<IColorTheme> {
return this._onThemeChange.event;
}
getIconTheme(): IIconTheme {
return this._iconTheme;
getFileIconTheme(): IFileIconTheme {
return this._fileIconTheme;
}
public get onIconThemeChange(): Event<IIconTheme> {
return this._onIconThemeChange.event;
public get onDidFileIconThemeChange(): Event<IFileIconTheme> {
return this._onFileIconThemeChange.event;
}
}