strict null - all of workbench common/browser/electron-browser

src/tsconfig.strictNullChecks.json

@@ -10,9 +10,9 @@
 		"./vs/code/**/*.ts",
 		"./vs/editor/**/*.ts",
 		"./vs/platform/**/*.ts",
-		"./vs/workbench/browser/parts/notifications/**/*",
-		"./vs/workbench/browser/parts/quickinput/**/*",
-		"./vs/workbench/electron-browser/actions/**/*",
+		"./vs/workbench/common/**/*",
+		"./vs/workbench/browser/**/*",
+		"./vs/workbench/electron-browser/**/*",
 		"./vs/workbench/contrib/emmet/**/*",
 		"./vs/workbench/contrib/externalTerminal/**/*",
 		"./vs/workbench/contrib/scm/**/*.ts",
@@ -124,99 +124,6 @@
 		"./vs/workbench/api/node/extHostWorkspace.ts",
 		"./vs/workbench/api/shared/editor.ts",
 		"./vs/workbench/api/shared/tasks.ts",
-		"./vs/workbench/browser/actions.ts",
-		"./vs/workbench/browser/actions/layoutActions.ts",
-		"./vs/workbench/browser/actions/listCommands.ts",
-		"./vs/workbench/browser/actions/navigationActions.ts",
-		"./vs/workbench/browser/actions/workspaceActions.ts",
-		"./vs/workbench/browser/actions/workspaceCommands.ts",
-		"./vs/workbench/browser/composite.ts",
-		"./vs/workbench/browser/contextkeys.ts",
-		"./vs/workbench/browser/dnd.ts",
-		"./vs/workbench/browser/editor.ts",
-		"./vs/workbench/browser/labels.ts",
-		"./vs/workbench/browser/legacyLayout.ts",
-		"./vs/workbench/browser/workbench.ts",
-		"./vs/workbench/browser/panel.ts",
-		"./vs/workbench/browser/part.ts",
-		"./vs/workbench/browser/parts/activitybar/activitybarActions.ts",
-		"./vs/workbench/browser/parts/activitybar/activitybarPart.ts",
-		"./vs/workbench/browser/parts/compositeBar.ts",
-		"./vs/workbench/browser/parts/compositeBarActions.ts",
-		"./vs/workbench/browser/parts/compositePart.ts",
-		"./vs/workbench/browser/parts/editor/baseEditor.ts",
-		"./vs/workbench/browser/parts/editor/binaryDiffEditor.ts",
-		"./vs/workbench/browser/parts/editor/binaryEditor.ts",
-		"./vs/workbench/browser/parts/editor/breadcrumbs.ts",
-		"./vs/workbench/browser/parts/editor/breadcrumbsControl.ts",
-		"./vs/workbench/browser/parts/editor/breadcrumbsModel.ts",
-		"./vs/workbench/browser/parts/editor/breadcrumbsPicker.ts",
-		"./vs/workbench/browser/parts/editor/editor.contribution.ts",
-		"./vs/workbench/browser/parts/editor/editor.ts",
-		"./vs/workbench/browser/parts/editor/editorActions.ts",
-		"./vs/workbench/browser/parts/editor/editorCommands.ts",
-		"./vs/workbench/browser/parts/editor/editorControl.ts",
-		"./vs/workbench/browser/parts/editor/editorDropTarget.ts",
-		"./vs/workbench/browser/parts/editor/editorGroupView.ts",
-		"./vs/workbench/browser/parts/editor/editorPart.ts",
-		"./vs/workbench/browser/parts/editor/editorPicker.ts",
-		"./vs/workbench/browser/parts/editor/editorStatus.ts",
-		"./vs/workbench/browser/parts/editor/editorWidgets.ts",
-		"./vs/workbench/browser/parts/editor/noTabsTitleControl.ts",
-		"./vs/workbench/browser/parts/editor/rangeDecorations.ts",
-		"./vs/workbench/browser/parts/editor/resourceViewer.ts",
-		"./vs/workbench/browser/parts/editor/sideBySideEditor.ts",
-		"./vs/workbench/browser/parts/editor/tabsTitleControl.ts",
-		"./vs/workbench/browser/parts/editor/textDiffEditor.ts",
-		"./vs/workbench/browser/parts/editor/textEditor.ts",
-		"./vs/workbench/browser/parts/editor/textResourceEditor.ts",
-		"./vs/workbench/browser/parts/editor/titleControl.ts",
-		"./vs/workbench/browser/parts/panel/panelActions.ts",
-		"./vs/workbench/browser/parts/panel/panelPart.ts",
-		"./vs/workbench/browser/parts/quickinput/quickInputBox.ts",
-		"./vs/workbench/browser/parts/quickinput/quickInputList.ts",
-		"./vs/workbench/browser/parts/quickinput/quickInputUtils.ts",
-		"./vs/workbench/browser/parts/quickopen/quickOpenActions.ts",
-		"./vs/workbench/browser/parts/quickopen/quickOpenController.ts",
-		"./vs/workbench/browser/parts/quickopen/quickopen.ts",
-		"./vs/workbench/browser/parts/sidebar/sidebarPart.ts",
-		"./vs/workbench/browser/parts/statusbar/statusbar.ts",
-		"./vs/workbench/browser/parts/statusbar/statusbarPart.ts",
-		"./vs/workbench/browser/parts/titlebar/menubarControl.ts",
-		"./vs/workbench/browser/parts/titlebar/titlebarPart.ts",
-		"./vs/workbench/browser/parts/views/customView.ts",
-		"./vs/workbench/browser/parts/views/panelViewlet.ts",
-		"./vs/workbench/browser/parts/views/views.ts",
-		"./vs/workbench/browser/parts/views/viewsViewlet.ts",
-		"./vs/workbench/browser/quickopen.ts",
-		"./vs/workbench/browser/style.ts",
-		"./vs/workbench/browser/viewlet.ts",
-		"./vs/workbench/browser/workbench.contribution.ts",
-		"./vs/workbench/common/actions.ts",
-		"./vs/workbench/common/activity.ts",
-		"./vs/workbench/common/component.ts",
-		"./vs/workbench/common/composite.ts",
-		"./vs/workbench/common/contextkeys.ts",
-		"./vs/workbench/common/contributions.ts",
-		"./vs/workbench/common/editor.ts",
-		"./vs/workbench/common/editor/binaryEditorModel.ts",
-		"./vs/workbench/common/editor/dataUriEditorInput.ts",
-		"./vs/workbench/common/editor/diffEditorInput.ts",
-		"./vs/workbench/common/editor/diffEditorModel.ts",
-		"./vs/workbench/common/editor/editorGroup.ts",
-		"./vs/workbench/common/editor/resourceEditorInput.ts",
-		"./vs/workbench/common/editor/resourceEditorModel.ts",
-		"./vs/workbench/common/editor/textDiffEditorModel.ts",
-		"./vs/workbench/common/editor/textEditorModel.ts",
-		"./vs/workbench/common/editor/untitledEditorInput.ts",
-		"./vs/workbench/common/editor/untitledEditorModel.ts",
-		"./vs/workbench/common/memento.ts",
-		"./vs/workbench/common/notifications.ts",
-		"./vs/workbench/common/panel.ts",
-		"./vs/workbench/common/resources.ts",
-		"./vs/workbench/common/theme.ts",
-		"./vs/workbench/common/viewlet.ts",
-		"./vs/workbench/common/views.ts",
 		"./vs/workbench/contrib/backup/common/backup.contribution.ts",
 		"./vs/workbench/contrib/backup/common/backupModelTracker.ts",
 		"./vs/workbench/contrib/backup/common/backupRestorer.ts",
@@ -392,7 +299,6 @@
 		"./vs/workbench/contrib/update/electron-browser/update.contribution.ts",
 		"./vs/workbench/contrib/update/electron-browser/update.ts",
 		"./vs/workbench/contrib/url/common/url.contribution.ts",
-		"./vs/workbench/electron-browser/window.ts",
 		"./vs/workbench/services/activity/browser/activityService.ts",
 		"./vs/workbench/services/activity/common/activity.ts",
 		"./vs/workbench/services/activityBar/browser/activityBarService.ts",

src/vs/workbench/browser/nodeless.simpleservices.ts

@@ -164,10 +164,12 @@ export class SimpleClipboardService implements IClipboardService {
 	writeText(text: string, type?: string): void { }
 
 	readText(type?: string): string {
+		// @ts-ignore
 		return undefined;
 	}
 
 	readFindText(): string {
+		// @ts-ignore
 		return undefined;
 	}
 
@@ -211,6 +213,7 @@ export class SimpleDownloadService implements IDownloadService {
 	_serviceBrand: any;
 
 	download(uri: URI, to?: string, cancellationToken?: CancellationToken): Promise<string> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 }
@@ -286,10 +289,12 @@ export class SimpleExtensionGalleryService implements IExtensionGalleryService {
 	}
 
 	query(options?: IQueryOptions): Promise<IPager<IGalleryExtension>> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	download(extension: IGalleryExtension, operation: InstallOperation): Promise<string> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
@@ -298,33 +303,41 @@ export class SimpleExtensionGalleryService implements IExtensionGalleryService {
 	}
 
 	getReadme(extension: IGalleryExtension, token: CancellationToken): Promise<string> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	getManifest(extension: IGalleryExtension, token: CancellationToken): Promise<IExtensionManifest> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	getChangelog(extension: IGalleryExtension, token: CancellationToken): Promise<string> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	getCoreTranslation(extension: IGalleryExtension, languageId: string): Promise<ITranslation> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	getAllVersions(extension: IGalleryExtension, compatible: boolean): Promise<IGalleryExtensionVersion[]> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	loadAllDependencies(dependencies: IExtensionIdentifier[], token: CancellationToken): Promise<IGalleryExtension[]> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	getExtensionsReport(): Promise<IReportedExtension[]> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
+	// @ts-ignore
 	getCompatibleExtension(extension: IGalleryExtension): Promise<IGalleryExtension>;
 	getCompatibleExtension(id: IExtensionIdentifier, version?: string): Promise<IGalleryExtension>;
 	getCompatibleExtension(id: any, version?: any) {
@@ -348,14 +361,17 @@ export class SimpleExtensionManagementService implements IExtensionManagementSer
 	onDidUninstallExtension = Event.None;
 
 	zip(extension: ILocalExtension): Promise<URI> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	unzip(zipLocation: URI, type: ExtensionType): Promise<IExtensionIdentifier> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	install(vsix: URI): Promise<IExtensionIdentifier> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
@@ -372,14 +388,17 @@ export class SimpleExtensionManagementService implements IExtensionManagementSer
 	}
 
 	getInstalled(type?: ExtensionType): Promise<ILocalExtension[]> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	getExtensionsReport(): Promise<IReportedExtension[]> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	updateMetadata(local: ILocalExtension, metadata: IGalleryMetadata): Promise<ILocalExtension> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 }
@@ -542,6 +561,7 @@ export class SimpleLifecycleService extends AbstractLifecycleService {
 			reason: ShutdownReason.QUIT
 		});
 
+		// @ts-ignore
 		return null;
 	}
 }
@@ -583,14 +603,17 @@ export class SimpleMultiExtensionsManagementService implements IExtensionManagem
 	onDidUninstallExtension = Event.None;
 
 	zip(extension: ILocalExtension): Promise<URI> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	unzip(zipLocation: URI, type: ExtensionType): Promise<IExtensionIdentifier> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	install(vsix: URI): Promise<IExtensionIdentifier> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
@@ -607,14 +630,17 @@ export class SimpleMultiExtensionsManagementService implements IExtensionManagem
 	}
 
 	getInstalled(type?: ExtensionType): Promise<ILocalExtension[]> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	getExtensionsReport(): Promise<IReportedExtension[]> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	updateMetadata(local: ILocalExtension, metadata: IGalleryMetadata): Promise<ILocalExtension> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 }
@@ -652,6 +678,7 @@ export class SimpleRemoteAgentService implements IRemoteAgentService {
 	_serviceBrand: any;
 
 	getConnection(): object {
+		// @ts-ignore
 		return undefined;
 	}
 }
@@ -667,6 +694,7 @@ export class SimpleRemoteAuthorityResolverService implements IRemoteAuthorityRes
 	_serviceBrand: any;
 
 	resolveAuthority(authority: string): Promise<ResolvedAuthority> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
@@ -696,6 +724,7 @@ export class SimpleRemoteFileService implements IFileService {
 	readonly onDidChangeFileSystemProviderRegistrations = Event.None;
 
 	resolveFile(resource: URI, options?: IResolveFileOptions): Promise<IFileStat> {
+		// @ts-ignore
 		return Promise.resolve(fileMap.get(resource));
 	}
 
@@ -708,16 +737,19 @@ export class SimpleRemoteFileService implements IFileService {
 	}
 
 	resolveContent(resource: URI, _options?: IResolveContentOptions): Promise<IContent> {
+		// @ts-ignore
 		return Promise.resolve(contentMap.get(resource));
 	}
 
 	resolveStreamContent(resource: URI, _options?: IResolveContentOptions): Promise<IStreamContent> {
 		return Promise.resolve(contentMap.get(resource)).then(content => {
 			return {
+				// @ts-ignore
 				resource: content.resource,
 				value: {
 					on: (event: string, callback: Function): void => {
 						if (event === 'data') {
+							// @ts-ignore
 							callback(content.value);
 						}
 
@@ -726,21 +758,28 @@ export class SimpleRemoteFileService implements IFileService {
 						}
 					}
 				},
+				// @ts-ignore
 				etag: content.etag,
+				// @ts-ignore
 				encoding: content.encoding,
+				// @ts-ignore
 				mtime: content.mtime,
+				// @ts-ignore
 				name: content.name
 			};
 		});
 	}
 
 	updateContent(resource: URI, value: string | ITextSnapshot, _options?: IUpdateContentOptions): Promise<IFileStat> {
+		// @ts-ignore
 		return Promise.resolve(fileMap.get(resource)).then(file => {
 			const content = contentMap.get(resource);
 
 			if (typeof value === 'string') {
+				// @ts-ignore
 				content.value = value;
 			} else {
+				// @ts-ignore
 				content.value = snapshotToString(value);
 			}
 
@@ -786,6 +825,7 @@ function initFakeFileSystem(): void {
 			name
 		};
 
+		// @ts-ignore
 		parent.children.push(file);
 
 		fileMap.set(file.resource, file);
@@ -810,6 +850,7 @@ function initFakeFileSystem(): void {
 			children: []
 		};
 
+		// @ts-ignore
 		parent.children.push(folder);
 
 		fileMap.set(folder.resource, folder);
@@ -1055,10 +1096,12 @@ export class SimpleSearchService implements ISearchService {
 			coalesce(localResults.values()).forEach(onProgress);
 		}
 
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
 	fileSearch(query: IFileQueryProps<URI>, token?: CancellationToken): Promise<ISearchComplete> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
@@ -1105,6 +1148,7 @@ export class SimpleSearchService implements ISearchService {
 				}
 
 				// Use editor API to find matches
+				// @ts-ignore
 				const matches = model.findMatches(query.contentPattern.pattern, false, query.contentPattern.isRegExp, query.contentPattern.isCaseSensitive, query.contentPattern.isWordMatch ? query.contentPattern.wordSeparators : null, false, query.maxResults);
 				if (matches.length) {
 					const fileMatch = new FileMatch(resource);
@@ -1113,6 +1157,7 @@ export class SimpleSearchService implements ISearchService {
 					const textSearchResults = editorMatchesToTextSearchResults(matches, model, query.previewOptions);
 					fileMatch.results = addContextToEditorMatches(textSearchResults, model, query);
 				} else {
+					// @ts-ignore
 					localResults.set(resource, null);
 				}
 			});
@@ -1179,6 +1224,7 @@ export class SimpleTextMateService implements ITextMateService {
 	readonly onDidEncounterLanguage: Event<LanguageId> = Event.None;
 
 	createGrammar(modeId: string): Promise<ITextMategrammar> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 }
@@ -1691,6 +1737,7 @@ export class SimpleWorkspaceEditingService implements IWorkspaceEditingService {
 	}
 
 	pickNewWorkspacePath(): Promise<URI> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 }
@@ -1769,6 +1816,7 @@ export class SimpleWorkspacesService implements IWorkspacesService {
 	_serviceBrand: any;
 
 	createUntitledWorkspace(folders?: IWorkspaceFolderCreationData[]): Promise<IWorkspaceIdentifier> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 
@@ -1777,6 +1825,7 @@ export class SimpleWorkspacesService implements IWorkspacesService {
 	}
 
 	getWorkspaceIdentifier(workspacePath: URI): Promise<IWorkspaceIdentifier> {
+		// @ts-ignore
 		return Promise.resolve(undefined);
 	}
 }

src/vs/workbench/electron-browser/main.contribution.ts

@@ -104,8 +104,8 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService';
 				windowsService.quit();
 			},
 			when: undefined,
-			primary: KeyMod.CtrlCmd | KeyCode.KEY_Q,
-			win: { primary: undefined }
+			mac: { primary: KeyMod.CtrlCmd | KeyCode.KEY_Q },
+			linux: { primary: KeyMod.CtrlCmd | KeyCode.KEY_Q }
 		});
 	})();