diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json index 616743c744dec92ba1ffa81210428336d381b2fc..e18e4c9cc987e2a2737aff55f48402257886d1d6 100644 --- a/src/tsconfig.strictNullChecks.json +++ b/src/tsconfig.strictNullChecks.json @@ -315,7 +315,9 @@ "./vs/platform/editor/common/editor.ts", "./vs/platform/environment/common/environment.ts", "./vs/platform/environment/node/argv.ts", + "./vs/platform/extensionManagement/common/extensionEnablementService.ts", "./vs/platform/extensionManagement/common/extensionManagement.ts", + "./vs/platform/extensionManagement/common/extensionManagementUtil.ts", "./vs/platform/extensionManagement/common/extensionNls.ts", "./vs/platform/extensionManagement/node/extensionLifecycle.ts", "./vs/platform/extensionManagement/node/extensionManagementIpc.ts", @@ -371,6 +373,7 @@ "./vs/platform/telemetry/common/telemetryUtils.ts", "./vs/platform/telemetry/node/telemetryNodeUtils.ts", "./vs/platform/theme/common/colorRegistry.ts", + "./vs/platform/theme/common/styler.ts", "./vs/platform/theme/common/themeService.ts", "./vs/platform/theme/test/common/testThemeService.ts", "./vs/platform/update/common/update.ts", @@ -382,9 +385,12 @@ "./vs/platform/workspace/test/common/testWorkspace.ts", "./vs/platform/workspaces/common/workspaces.ts", "./vs/platform/workspaces/node/workspaces.ts", + "./vs/vscode.d.ts", + "./vs/vscode.proposed.d.ts", "./vs/workbench/api/shared/tasks.ts", "./vs/workbench/browser/part.ts", "./vs/workbench/browser/parts/quickinput/quickInputUtils.ts", + "./vs/workbench/browser/parts/quickopen/quickopen.ts", "./vs/workbench/browser/parts/statusbar/statusbar.ts", "./vs/workbench/common/activity.ts", "./vs/workbench/common/component.ts", diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts index 302932bef548d4f7b8efb49341568ac413714001..f84b2ca4fcc4834068ee50e718c9476c77a3a4d7 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts @@ -98,7 +98,7 @@ export function getGalleryExtensionTelemetryData(extension: IGalleryExtension): publisherId: extension.publisherId, publisherName: extension.publisher, publisherDisplayName: extension.publisherDisplayName, - dependencies: extension.properties.dependencies.length > 0, + dependencies: !!(extension.properties.dependencies && extension.properties.dependencies.length > 0), ...extension.telemetryData }; } diff --git a/src/vs/platform/theme/common/styler.ts b/src/vs/platform/theme/common/styler.ts index 013395ef8b095e37f0ea17ba9494db6a57b20c44..55c607bfd5a702548af9c186356cbe990daf2ee3 100644 --- a/src/vs/platform/theme/common/styler.ts +++ b/src/vs/platform/theme/common/styler.ts @@ -9,10 +9,10 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import { Color } from 'vs/base/common/color'; import { mixin } from 'vs/base/common/objects'; -export type styleFn = (colors: { [name: string]: Color }) => void; +export type styleFn = (colors: { [name: string]: Color | null }) => void; export interface IStyleOverrides { - [color: string]: ColorIdentifier; + [color: string]: ColorIdentifier | undefined; } export interface IThemable { @@ -24,7 +24,7 @@ export interface IColorMapping { } export interface IComputedStyles { - [color: string]: Color; + [color: string]: Color | null; } export function computeStyles(theme: ITheme, styleMap: IColorMapping): IComputedStyles { diff --git a/src/vs/workbench/browser/parts/quickopen/quickopen.ts b/src/vs/workbench/browser/parts/quickopen/quickopen.ts index b5029814e52047186ae29f98215d9c0af9d7d0ee..59472f7c98d148c430545a25bde9fae52afff6a7 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickopen.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickopen.ts @@ -23,7 +23,7 @@ export const QUICKOPEN_ACION_LABEL = nls.localize('quickOpen', "Go to File..."); CommandsRegistry.registerCommand(QUICKOPEN_ACTION_ID, function (accessor: ServicesAccessor, prefix: string | null = null) { const quickOpenService = accessor.get(IQuickOpenService); - return quickOpenService.show(typeof prefix === 'string' ? prefix : null).then(() => { + return quickOpenService.show(typeof prefix === 'string' ? prefix : undefined).then(() => { return void 0; }); }); @@ -32,7 +32,7 @@ export const QUICKOPEN_FOCUS_SECONDARY_ACTION_ID = 'workbench.action.quickOpenPr CommandsRegistry.registerCommand(QUICKOPEN_FOCUS_SECONDARY_ACTION_ID, function (accessor: ServicesAccessor, prefix: string | null = null) { const quickOpenService = accessor.get(IQuickOpenService); - return quickOpenService.show(null, { autoFocus: { autoFocusSecondEntry: true } }).then(() => { + return quickOpenService.show(undefined, { autoFocus: { autoFocusSecondEntry: true } }).then(() => { return void 0; }); }); @@ -71,8 +71,8 @@ export function getQuickNavigateHandler(id: string, next?: boolean): ICommandHan const keys = keybindingService.lookupKeybindings(id); const quickNavigate = { keybindings: keys }; - quickOpenService.navigate(next, quickNavigate); - quickInputService.navigate(next, quickNavigate); + quickOpenService.navigate(!!next, quickNavigate); + quickInputService.navigate(!!next, quickNavigate); }; }