Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 01:58:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup typing

Browse Source
This commit is contained in:
Christof Marti
2020-10-22 11:09:15 +02:00
parent 9465dbe8cc
commit 329c86960a
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/vs/workbench/api/common/extHostQuickOpen.ts
View File

@@ -446,24 +446,17 @@ function getIconUris(iconPath: QuickInputButton['iconPath']): { dark: URI, light
if (iconPath instanceof ThemeIcon) {
return { id: iconPath.id };
}
const dark = getDarkIconUri(iconPath as any);
const light = getLightIconUri(iconPath as any);
const dark = getDarkIconUri(iconPath as URI | { light: URI; dark: URI; });
const light = getLightIconUri(iconPath as URI | { light: URI; dark: URI; });
return { dark, light };
}
function getLightIconUri(iconPath: string | URI | { light: URI; dark: URI; }) {
return getIconUri(typeof iconPath === 'object' && 'light' in iconPath ? iconPath.light : iconPath);
function getLightIconUri(iconPath: URI | { light: URI; dark: URI; }) {
return typeof iconPath === 'object' && 'light' in iconPath ? iconPath.light : iconPath;
}
function getDarkIconUri(iconPath: string | URI | { light: URI; dark: URI; }) {
return getIconUri(typeof iconPath === 'object' && 'dark' in iconPath ? iconPath.dark : iconPath);
}
function getIconUri(iconPath: string | URI) {
if (URI.isUri(iconPath)) {
return iconPath;
}
return URI.file(iconPath);
function getDarkIconUri(iconPath: URI | { light: URI; dark: URI; }) {
return typeof iconPath === 'object' && 'dark' in iconPath ? iconPath.dark : iconPath;
}
class ExtHostQuickPick<T extends QuickPickItem> extends ExtHostQuickInput implements QuickPick<T> {

2
src/vs/workbench/api/common/extHostTypes.ts
View File

@@ -2729,7 +2729,7 @@ export enum DebugConfigurationProviderTriggerKind {
@es5ClassCompat
export class QuickInputButtons {
static readonly Back: vscode.QuickInputButton | { iconPath: string } = { iconPath: 'back.svg' };
static readonly Back: vscode.QuickInputButton = { iconPath: new ThemeIcon('arrow-left') };
private constructor() { }
}