diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts index 2b769bf1c65..7d6d0fe4f6b 100644 --- a/src/vs/code/electron-main/windows.ts +++ b/src/vs/code/electron-main/windows.ts @@ -1984,7 +1984,7 @@ class WorkspacesManager { ) { } - saveAndEnterWorkspace(window: ICodeWindow, path: string): Promise { + saveAndEnterWorkspace(window: ICodeWindow, path: string): Promise { if (!window || !window.win || !window.isReady || !window.openedWorkspace || !path || !this.isValidTargetWorkspacePath(window, path)) { return Promise.resolve(null); // return early if the window is not ready or disposed or does not have a workspace } @@ -1992,7 +1992,7 @@ class WorkspacesManager { return this.doSaveAndOpenWorkspace(window, window.openedWorkspace, path); } - enterWorkspace(window: ICodeWindow, path: string): Promise { + enterWorkspace(window: ICodeWindow, path: string): Promise { if (!window || !window.win || !window.isReady) { return Promise.resolve(null); // return early if the window is not ready or disposed } @@ -2009,7 +2009,7 @@ class WorkspacesManager { } - createAndEnterWorkspace(window: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): Promise { + createAndEnterWorkspace(window: ICodeWindow, folders?: IWorkspaceFolderCreationData[], path?: string): Promise { if (!window || !window.win || !window.isReady) { return Promise.resolve(null); // return early if the window is not ready or disposed } diff --git a/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts b/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts index 3dbccd60ba0..52046064199 100644 --- a/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts +++ b/src/vs/editor/contrib/goToDefinition/goToDefinitionMouse.ts @@ -281,7 +281,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC DefinitionProviderRegistry.has(this.editor.getModel()); } - private findDefinition(target: IMouseTarget, token: CancellationToken): Promise { + private findDefinition(target: IMouseTarget, token: CancellationToken): Promise { const model = this.editor.getModel(); if (!model) { return Promise.resolve(null); diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts index d57fe21bbbf..21d557df45d 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts @@ -166,7 +166,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape { return Promise.reject(disposed(`TextEditor(${id})`)); } this._documentsAndEditors.getEditor(id).setSelections(selections); - return Promise.resolve(null); + return Promise.resolve(void 0); } $trySetDecorations(id: string, key: string, ranges: IDecorationOptions[]): Promise { @@ -175,7 +175,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape { return Promise.reject(disposed(`TextEditor(${id})`)); } this._documentsAndEditors.getEditor(id).setDecorations(key, ranges); - return Promise.resolve(null); + return Promise.resolve(void 0); } $trySetDecorationsFast(id: string, key: string, ranges: number[]): Promise { @@ -184,7 +184,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape { return Promise.reject(disposed(`TextEditor(${id})`)); } this._documentsAndEditors.getEditor(id).setDecorationsFast(key, ranges); - return Promise.resolve(null); + return Promise.resolve(void 0); } $tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): Promise { @@ -200,7 +200,7 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape { return Promise.reject(disposed(`TextEditor(${id})`)); } this._documentsAndEditors.getEditor(id).setConfiguration(options); - return Promise.resolve(null); + return Promise.resolve(void 0); } $tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): Promise { diff --git a/src/vs/workbench/api/electron-browser/mainThreadUrls.ts b/src/vs/workbench/api/electron-browser/mainThreadUrls.ts index d4a3f429742..5d550492b29 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadUrls.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadUrls.ts @@ -48,14 +48,14 @@ export class MainThreadUrls implements MainThreadUrlsShape { this.handlers.set(handle, { extensionId, disposable }); this.inactiveExtensionUrlHandler.registerExtensionHandler(extensionId, handler); - return Promise.resolve(null); + return Promise.resolve(void 0); } $unregisterUriHandler(handle: number): Promise { const tuple = this.handlers.get(handle); if (!tuple) { - return Promise.resolve(null); + return Promise.resolve(void 0); } const { extensionId, disposable } = tuple; @@ -64,7 +64,7 @@ export class MainThreadUrls implements MainThreadUrlsShape { this.handlers.delete(handle); disposable.dispose(); - return Promise.resolve(null); + return Promise.resolve(void 0); } dispose(): void { diff --git a/src/vs/workbench/api/node/extHostComments.ts b/src/vs/workbench/api/node/extHostComments.ts index 2280861a2e7..72c6d9caac0 100644 --- a/src/vs/workbench/api/node/extHostComments.ts +++ b/src/vs/workbench/api/node/extHostComments.ts @@ -67,7 +67,7 @@ export class ExtHostComments implements ExtHostCommentsShape { }; } - $createNewCommentThread(handle: number, uri: UriComponents, range: IRange, text: string): Promise { + $createNewCommentThread(handle: number, uri: UriComponents, range: IRange, text: string): Promise { const data = this._documents.getDocumentData(URI.revive(uri)); const ran = extHostTypeConverter.Range.to(range); @@ -81,7 +81,7 @@ export class ExtHostComments implements ExtHostCommentsShape { }).then(commentThread => commentThread ? convertToCommentThread(provider, commentThread, this._commandsConverter) : null); } - $replyToCommentThread(handle: number, uri: UriComponents, range: IRange, thread: modes.CommentThread, text: string): Promise { + $replyToCommentThread(handle: number, uri: UriComponents, range: IRange, thread: modes.CommentThread, text: string): Promise { const data = this._documents.getDocumentData(URI.revive(uri)); const ran = extHostTypeConverter.Range.to(range); @@ -154,7 +154,7 @@ export class ExtHostComments implements ExtHostCommentsShape { }).then(commentInfo => commentInfo ? convertCommentInfo(handle, provider, commentInfo, this._commandsConverter) : null); } - $provideWorkspaceComments(handle: number): Promise { + $provideWorkspaceComments(handle: number): Promise { const provider = this._workspaceProviders.get(handle); if (!provider) { return Promise.resolve(null); diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts index 236028b92a5..5157534de1d 100644 --- a/src/vs/workbench/api/node/extHostExtensionService.ts +++ b/src/vs/workbench/api/node/extHostExtensionService.ts @@ -475,7 +475,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape { private _handleWorkspaceContainsEagerExtensions(workspace: IWorkspaceData): Promise { if (!workspace || workspace.folders.length === 0) { - return Promise.resolve(null); + return Promise.resolve(void 0); } return Promise.all( @@ -572,7 +572,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape { private _handleExtensionTests(): Promise { if (!this._initData.environment.extensionTestsPath || !this._initData.environment.extensionDevelopmentLocationURI) { - return Promise.resolve(null); + return Promise.resolve(void 0); } // Require the test runner via node require from the provided path diff --git a/src/vs/workbench/api/node/extHostSCM.ts b/src/vs/workbench/api/node/extHostSCM.ts index 78b7d251776..54013036c11 100644 --- a/src/vs/workbench/api/node/extHostSCM.ts +++ b/src/vs/workbench/api/node/extHostSCM.ts @@ -283,7 +283,7 @@ class ExtHostSourceControlResourceGroup implements vscode.SourceControlResourceG const command = this._resourceStatesCommandsMap.get(handle); if (!command) { - return Promise.resolve(null); + return Promise.resolve(void 0); } return asPromise(() => this._commands.executeCommand(command.command, ...command.arguments)); @@ -608,7 +608,7 @@ export class ExtHostSCM implements ExtHostSCMShape { return inputBox; } - $provideOriginalResource(sourceControlHandle: number, uriComponents: UriComponents, token: CancellationToken): Promise { + $provideOriginalResource(sourceControlHandle: number, uriComponents: UriComponents, token: CancellationToken): Promise { const uri = URI.revive(uriComponents); this.logService.trace('ExtHostSCM#$provideOriginalResource', sourceControlHandle, uri.toString()); @@ -627,11 +627,11 @@ export class ExtHostSCM implements ExtHostSCMShape { const sourceControl = this._sourceControls.get(sourceControlHandle); if (!sourceControl) { - return Promise.resolve(null); + return Promise.resolve(void 0); } sourceControl.inputBox.$onInputBoxValueChange(value); - return Promise.resolve(null); + return Promise.resolve(void 0); } $executeResourceCommand(sourceControlHandle: number, groupHandle: number, handle: number): Promise { @@ -640,13 +640,13 @@ export class ExtHostSCM implements ExtHostSCMShape { const sourceControl = this._sourceControls.get(sourceControlHandle); if (!sourceControl) { - return Promise.resolve(null); + return Promise.resolve(void 0); } const group = sourceControl.getResourceGroup(groupHandle); if (!group) { - return Promise.resolve(null); + return Promise.resolve(void 0); } return group.$executeResourceCommand(handle); @@ -708,6 +708,6 @@ export class ExtHostSCM implements ExtHostSCMShape { }); this._selectedSourceControlHandles = set; - return Promise.resolve(null); + return Promise.resolve(void 0); } } diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index d51e2c1cb2c..c8342cda666 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -341,7 +341,7 @@ class ExtHostTreeView extends Disposable { return this.refreshHandles(handlesToRefresh); } } - return Promise.resolve(null); + return Promise.resolve(void 0); } private getHandlesToRefresh(elements: T[]): TreeItemHandle[] { diff --git a/src/vs/workbench/api/node/extHostUrls.ts b/src/vs/workbench/api/node/extHostUrls.ts index 5260672b8d4..e458333f517 100644 --- a/src/vs/workbench/api/node/extHostUrls.ts +++ b/src/vs/workbench/api/node/extHostUrls.ts @@ -44,7 +44,7 @@ export class ExtHostUrls implements ExtHostUrlsShape { const handler = this.handlers.get(handle); if (!handler) { - return Promise.resolve(null); + return Promise.resolve(void 0); } try { handler.handleUri(URI.revive(uri)); @@ -52,6 +52,6 @@ export class ExtHostUrls implements ExtHostUrlsShape { onUnexpectedError(err); } - return Promise.resolve(null); + return Promise.resolve(void 0); } } diff --git a/src/vs/workbench/browser/parts/editor/editorGroupView.ts b/src/vs/workbench/browser/parts/editor/editorGroupView.ts index a7acb4b8513..2de433f9dba 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupView.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupView.ts @@ -724,7 +724,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView { //#region openEditor() - openEditor(editor: EditorInput, options?: EditorOptions): Promise { + openEditor(editor: EditorInput, options?: EditorOptions): Promise { // Guard against invalid inputs if (!editor) { @@ -847,7 +847,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView { //#region openEditors() - openEditors(editors: { editor: EditorInput, options?: EditorOptions }[]): Promise { + openEditors(editors: { editor: EditorInput, options?: EditorOptions }[]): Promise { if (!editors.length) { return Promise.resolve(null); } diff --git a/src/vs/workbench/browser/parts/editor/editorPicker.ts b/src/vs/workbench/browser/parts/editor/editorPicker.ts index b27ed329dfd..fa42c37bd47 100644 --- a/src/vs/workbench/browser/parts/editor/editorPicker.ts +++ b/src/vs/workbench/browser/parts/editor/editorPicker.ts @@ -90,7 +90,7 @@ export abstract class BaseEditorPicker extends QuickOpenHandler { this.scorerCache = Object.create(null); } - getResults(searchValue: string, token: CancellationToken): Promise { + getResults(searchValue: string, token: CancellationToken): Promise { const editorEntries = this.getEditorEntries(); if (!editorEntries.length) { return Promise.resolve(null); diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index afe34275bb4..d42ecfe5ccd 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -529,7 +529,7 @@ export class QuickOpenController extends Component implements IQuickOpenService const model = new QuickOpenModel([new PlaceholderQuickOpenEntry(placeHolderLabel)], this.actionProvider); this.showModel(model, resolvedHandler.getAutoFocus(value, { model, quickNavigateConfiguration: this.quickOpenWidget.getQuickNavigateConfiguration() }), resolvedHandler.getAriaLabel()); - return Promise.resolve(null); + return Promise.resolve(void 0); } // Support extra class from handler diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts index 62ba18371ce..df91b8ee956 100644 --- a/src/vs/workbench/browser/parts/views/customView.ts +++ b/src/vs/workbench/browser/parts/views/customView.ts @@ -469,7 +469,7 @@ export class CustomTreeView extends Disposable implements ITreeView { this.elementsToRefresh.push(...elements); } } - return Promise.resolve(null); + return Promise.resolve(void 0); } expand(itemOrItems: ITreeItem | ITreeItem[]): Promise { @@ -477,7 +477,7 @@ export class CustomTreeView extends Disposable implements ITreeView { itemOrItems = Array.isArray(itemOrItems) ? itemOrItems : [itemOrItems]; return this.tree.expandAll(itemOrItems); } - return Promise.arguments(null); + return Promise.resolve(void 0); } setSelection(items: ITreeItem[]): void { @@ -497,7 +497,7 @@ export class CustomTreeView extends Disposable implements ITreeView { if (this.tree) { return this.tree.reveal(item); } - return Promise.arguments(null); + return Promise.resolve(null); } private activate() { @@ -525,7 +525,7 @@ export class CustomTreeView extends Disposable implements ITreeView { } }); } - return Promise.resolve(null); + return Promise.resolve(void 0); } private updateContentAreas(): void { diff --git a/src/vs/workbench/browser/parts/views/views.ts b/src/vs/workbench/browser/parts/views/views.ts index f618b70cb0a..8ff19a74ba5 100644 --- a/src/vs/workbench/browser/parts/views/views.ts +++ b/src/vs/workbench/browser/parts/views/views.ts @@ -537,7 +537,7 @@ export class ViewsService extends Disposable implements IViewsService { return this.viewDescriptorCollections.get(container); } - openView(id: string, focus: boolean): Promise { + openView(id: string, focus: boolean): Promise { const viewDescriptor = ViewsRegistry.getView(id); if (viewDescriptor) { const viewletDescriptor = this.viewletService.getViewlet(viewDescriptor.container.id); diff --git a/src/vs/workbench/browser/quickopen.ts b/src/vs/workbench/browser/quickopen.ts index c4a6346e546..ca4891c4f1b 100644 --- a/src/vs/workbench/browser/quickopen.ts +++ b/src/vs/workbench/browser/quickopen.ts @@ -43,14 +43,14 @@ export class QuickOpenHandler { * As such, returning the same model instance across multiple searches will yield best * results in terms of performance when many items are shown. */ - getResults(searchValue: string, token: CancellationToken): Promise> { + getResults(searchValue: string, token: CancellationToken): Promise | null> { return Promise.resolve(null); } /** * The ARIA label to apply when this quick open handler is active in quick open. */ - getAriaLabel(): string { + getAriaLabel() { return null; } @@ -330,6 +330,6 @@ export class QuickOpenAction extends Action { // Show with prefix this.quickOpenService.show(this.prefix); - return Promise.resolve(null); + return Promise.resolve(void 0); } } diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index e9041e337b8..43198fb1ed6 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -81,7 +81,7 @@ export class CloseWorkspaceAction extends Action { if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) { this.notificationService.info(nls.localize('noWorkspaceOpened', "There is currently no workspace opened in this instance to close.")); - return Promise.resolve(null); + return Promise.resolve(void 0); } return this.windowService.closeWorkspace(); diff --git a/src/vs/workbench/parts/comments/electron-browser/commentsTreeViewer.ts b/src/vs/workbench/parts/comments/electron-browser/commentsTreeViewer.ts index 50c16559f3e..8bf50628901 100644 --- a/src/vs/workbench/parts/comments/electron-browser/commentsTreeViewer.ts +++ b/src/vs/workbench/parts/comments/electron-browser/commentsTreeViewer.ts @@ -47,7 +47,7 @@ export class CommentsDataSource implements IDataSource { } public getParent(tree: ITree, element: any): Promise { - return Promise.resolve(null); + return Promise.resolve(void 0); } public shouldAutoexpand(tree: ITree, element: any): boolean { diff --git a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts index 3dbe2c0ef00..aef4d76df71 100644 --- a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts +++ b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts @@ -119,7 +119,7 @@ class RunToCursorAction extends EditorAction { const debugService = accessor.get(IDebugService); const focusedSession = debugService.getViewModel().focusedSession; if (debugService.state !== State.Stopped || !focusedSession) { - return Promise.resolve(null); + return Promise.resolve(void 0); } let breakpointToRemove: IBreakpoint; diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts index 79d90ad6394..ca0a8150897 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -219,7 +219,7 @@ export class Expression extends ExpressionContainer implements IExpression { this.available = false; this.reference = 0; - return Promise.resolve(null); + return Promise.resolve(void 0); } this.session = session; @@ -427,7 +427,7 @@ export class Thread implements IThread { */ fetchCallStack(levels = 20): Promise { if (!this.stopped) { - return Promise.resolve(null); + return Promise.resolve(void 0); } const start = this.callStack.length; @@ -472,7 +472,7 @@ export class Thread implements IThread { /** * Returns exception info promise if the exception was thrown, otherwise null */ - get exceptionInfo(): Promise { + get exceptionInfo(): Promise { if (this.stoppedDetails && this.stoppedDetails.reason === 'exception') { if (this.session.capabilities.supportsExceptionInfoRequest) { return this.session.exceptionInfo(this.threadId); diff --git a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts index 978ef4822f1..126f29dd15a 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts @@ -178,7 +178,7 @@ export class DebugHoverWidget implements IContentWidget { className: 'hoverHighlight' }); - private doFindExpression(container: IExpressionContainer, namesToFind: string[]): Promise { + private doFindExpression(container: IExpressionContainer, namesToFind: string[]): Promise { if (!container) { return Promise.resolve(null); } @@ -231,7 +231,7 @@ export class DebugHoverWidget implements IContentWidget { this.valueContainer.focus(); } - return Promise.resolve(null); + return Promise.resolve(void 0); } this.valueContainer.hidden = true; diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index 28023df1708..59af82f655b 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -695,7 +695,7 @@ export class DebugService implements IDebugService { }); } - private runTask(root: IWorkspaceFolder, taskId: string | TaskIdentifier): Promise { + private runTask(root: IWorkspaceFolder, taskId: string | TaskIdentifier): Promise { if (!taskId) { return Promise.resolve(null); } diff --git a/src/vs/workbench/parts/debug/electron-browser/debugSession.ts b/src/vs/workbench/parts/debug/electron-browser/debugSession.ts index d0b01b5ae7b..bf8f17e9dce 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugSession.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugSession.ts @@ -294,7 +294,7 @@ export class DebugSession implements IDebugSession { if (this.raw.readyForBreakpoints) { return this.raw.setExceptionBreakpoints({ filters: exbpts.map(exb => exb.filter) }).then(() => undefined); } - return Promise.resolve(null); + return Promise.resolve(void 0); } return Promise.reject(new Error('no debug adapter')); } diff --git a/src/vs/workbench/parts/debug/node/debugAdapter.ts b/src/vs/workbench/parts/debug/node/debugAdapter.ts index 2d798bf2df0..27779eb9e95 100644 --- a/src/vs/workbench/parts/debug/node/debugAdapter.ts +++ b/src/vs/workbench/parts/debug/node/debugAdapter.ts @@ -407,7 +407,7 @@ export class ExecutableDebugAdapter extends StreamDebugAdapter { this.cancelPending(); if (!this.serverProcess) { - return Promise.resolve(null); + return Promise.resolve(void 0); } // when killing a process in windows its child @@ -425,7 +425,7 @@ export class ExecutableDebugAdapter extends StreamDebugAdapter { }); } else { this.serverProcess.kill('SIGTERM'); - return Promise.resolve(null); + return Promise.resolve(void 0); } } diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts index 16ee2a8d670..66c611888fb 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts @@ -121,7 +121,7 @@ class NavBar { this.currentId = id; this._onChange.fire({ id, focus }); this.actions.forEach(a => a.enabled = a.id !== id); - return Promise.resolve(null); + return Promise.resolve(void 0); } dispose(): void { @@ -501,7 +501,7 @@ export class ExtensionEditor extends BaseEditor { }); } - private open(id: string, extension: IExtension): Promise { + private open(id: string, extension: IExtension): Promise { switch (id) { case NavbarSection.Readme: return this.openReadme(); case NavbarSection.Contributions: return this.openContributions(); @@ -697,7 +697,7 @@ export class ExtensionEditor extends BaseEditor { return this.extension.extensionPack.length > 0; } - getChildren(): Promise { + getChildren(): Promise { if (this.hasChildren) { const names = arrays.distinct(this.extension.extensionPack, e => e.toLowerCase()); return extensionsWorkbenchService.queryGallery({ names, pageSize: names.length }) diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts index 9d2326b8e71..0d385e957c0 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts @@ -259,7 +259,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe */ private fetchWorkspaceRecommendations(): Promise { - if (!this.isEnabled) { return Promise.resolve(null); } + if (!this.isEnabled) { return Promise.resolve(void 0); } return this.fetchExtensionRecommendationContents() .then(result => this.validateExtensions(result.map(({ contents }) => contents)) @@ -949,7 +949,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe || !this.fileService.canHandleResource(this.contextService.getWorkspace().folders[0].uri) || this._dynamicWorkspaceRecommendations.length || !this._extensionsRecommendationsUrl) { - return Promise.resolve(null); + return Promise.resolve(void 0); } const storageKey = 'extensionsAssistant/dynamicWorkspaceRecommendations'; diff --git a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts index 5c116da9d30..410c9c9a1fe 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/emptyView.ts @@ -124,7 +124,7 @@ export class EmptyView extends ViewletPanel { } public setVisible(visible: boolean): Promise { - return Promise.resolve(null); + return Promise.resolve(void 0); } public focusBody(): void { @@ -134,7 +134,7 @@ export class EmptyView extends ViewletPanel { } protected reveal(element: any, relativeTop?: number): Promise { - return Promise.resolve(null); + return Promise.resolve(void 0); } public getActions(): IAction[] { diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts index ce2a419ec3d..f2af83afd23 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts @@ -734,7 +734,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView */ public refresh(): Promise { if (!this.explorerViewer || this.explorerViewer.getHighlight()) { - return Promise.resolve(null); + return Promise.resolve(void 0); } // Focus @@ -757,7 +757,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView return this.select(resourceToFocus, true); } - return Promise.resolve(null); + return Promise.resolve(void 0); }); } @@ -923,18 +923,18 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView // Require valid path if (!resource) { - return Promise.resolve(null); + return Promise.resolve(void 0); } // If path already selected, just reveal and return const selection = this.hasSingleSelection(resource); if (selection) { - return reveal ? this.reveal(selection, 0.5) : Promise.resolve(null); + return reveal ? this.reveal(selection, 0.5) : Promise.resolve(void 0); } // First try to get the stat object from the input to avoid a roundtrip if (!this.isCreated) { - return Promise.resolve(null); + return Promise.resolve(void 0); } const fileStat = this.model.findClosest(resource); @@ -969,7 +969,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView private doSelect(fileStat: ExplorerItem, reveal: boolean): Promise { if (!fileStat) { - return Promise.resolve(null); + return Promise.resolve(void 0); } // Special case: we are asked to reveal and select an element that is not visible @@ -977,7 +977,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView if (!this.filter.isVisible(this.tree, fileStat)) { fileStat = fileStat.parent; if (!fileStat) { - return Promise.resolve(null); + return Promise.resolve(void 0); } } @@ -986,7 +986,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView if (reveal) { revealPromise = this.reveal(fileStat, 0.5); } else { - revealPromise = Promise.resolve(null); + revealPromise = Promise.resolve(void 0); } return revealPromise.then(() => { @@ -1000,7 +1000,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView private reveal(element: any, relativeTop?: number): Promise { if (!this.tree) { - return Promise.resolve(null); // return early if viewlet has not yet been created + return Promise.resolve(void 0); // return early if viewlet has not yet been created } return this.tree.reveal(element, relativeTop); } diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts index d7b23a0b15a..d5b8d08fd31 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -120,7 +120,7 @@ export class FileDataSource implements IDataSource { } } - public getParent(tree: ITree, stat: ExplorerItem | Model): Promise { + public getParent(tree: ITree, stat: ExplorerItem | Model): Promise { if (!stat) { return Promise.resolve(null); // can be null if nothing selected in the tree } diff --git a/src/vs/workbench/parts/output/browser/outputPanel.ts b/src/vs/workbench/parts/output/browser/outputPanel.ts index d72b6a8e4f9..346b76de9e6 100644 --- a/src/vs/workbench/parts/output/browser/outputPanel.ts +++ b/src/vs/workbench/parts/output/browser/outputPanel.ts @@ -115,7 +115,7 @@ export class OutputPanel extends AbstractTextResourceEditor { public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Promise { this._focus = !options.preserveFocus; if (input.matches(this.input)) { - return Promise.resolve(null); + return Promise.resolve(void 0); } if (this.input) { diff --git a/src/vs/workbench/parts/output/electron-browser/outputServices.ts b/src/vs/workbench/parts/output/electron-browser/outputServices.ts index 58ebefeac15..20e0a533388 100644 --- a/src/vs/workbench/parts/output/electron-browser/outputServices.ts +++ b/src/vs/workbench/parts/output/electron-browser/outputServices.ts @@ -246,9 +246,9 @@ class OutputChannelBackedByFile extends AbstractFileOutputChannel implements Out this.startOffset = 0; this.endOffset = 0; if (this.model) { - return this.loadModel().then(() => null); + return this.loadModel().then(() => void 0); } - return Promise.resolve(null); + return Promise.resolve(void 0); } private loadFile(): Promise { @@ -487,7 +487,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo if (this._outputPanel && !preserveFocus) { this._outputPanel.focus(); } - return Promise.resolve(null); + return Promise.resolve(void 0); } this.activeChannel = channel; @@ -530,7 +530,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo return this.doShowChannel(this.activeChannel, preserveFocus); } } - return Promise.resolve(null); + return Promise.resolve(void 0); } private onDidPanelClose(panel: IPanel): void { @@ -616,7 +616,7 @@ export class OutputService extends Disposable implements IOutputService, ITextMo // Activate smart scroll when switching back to the output panel .then(() => this.setPrimaryCursorToLastLine()); } - return Promise.resolve(null); + return Promise.resolve(void 0); } private isChannelShown(channel: IOutputChannel): boolean { diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index f6bdf64b687..70c2887289f 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -523,7 +523,7 @@ class PreferencesRenderersController extends Disposable { if (!query) { // Don't open the other settings targets when query is empty this._onDidFilterResultsCountChange.fire({ target, count: 0 }); - return Promise.resolve(null); + return Promise.resolve(void 0); } return this.getPreferencesEditorModel(target).then(model => { @@ -585,7 +585,7 @@ class PreferencesRenderersController extends Disposable { } } - private _filterOrSearchPreferences(filter: string, preferencesRenderer: IPreferencesRenderer, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): Promise { + private _filterOrSearchPreferences(filter: string, preferencesRenderer: IPreferencesRenderer, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): Promise { if (!preferencesRenderer) { return Promise.resolve(null); } @@ -1096,7 +1096,7 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements this._register(this.editor.onDidChangeModel(() => this._onModelChanged())); } - updatePreferencesRenderer(associatedPreferencesModelUri: URI): Promise> { + updatePreferencesRenderer(associatedPreferencesModelUri: URI): Promise | null> { if (!this.preferencesRendererCreationPromise) { this.preferencesRendererCreationPromise = this._createPreferencesRenderer(); } diff --git a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts index 17a1d063364..218ec5d67f1 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts @@ -554,7 +554,7 @@ export class SettingsTargetsWidget extends Widget { this.settingsTarget = settingsTarget; this._onDidTargetChange.fire(this.settingsTarget); } - return Promise.resolve(null); + return Promise.resolve(void 0); } private update(): void { diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts index 8d5be3338e7..8c7a761cff1 100644 --- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts +++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts @@ -1629,7 +1629,7 @@ class CopySettingIdAction extends Action { this.clipboardService.writeText(context.setting.key); } - return Promise.resolve(null); + return Promise.resolve(void 0); } } @@ -1649,6 +1649,6 @@ class CopySettingAsJSONAction extends Action { this.clipboardService.writeText(jsonResult); } - return Promise.resolve(null); + return Promise.resolve(void 0); } } diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts index 76c7f4a101c..0612ae53c82 100644 --- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts +++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts @@ -103,7 +103,7 @@ export class LocalSearchProvider implements ISearchProvider { .trim(); } - searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): Promise { + searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): Promise { if (!this._filter) { return Promise.resolve(null); } diff --git a/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts index b7386555b75..7b7f16f1c48 100644 --- a/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts +++ b/src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts @@ -894,7 +894,7 @@ export class SettingsEditor2 extends BaseEditor { } } - return Promise.resolve(null); + return Promise.resolve(void 0); } private updateElementsByKey(keys: string[]): Promise { @@ -924,7 +924,7 @@ export class SettingsEditor2 extends BaseEditor { private renderTree(key?: string, force = false): Promise { if (!force && key && this.scheduledRefreshes.has(key)) { this.updateModifiedLabelForKey(key); - return Promise.resolve(null); + return Promise.resolve(void 0); } // If a setting control is currently focused, schedule a refresh for later diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts index 934df855438..23b5d9275d7 100644 --- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts @@ -156,7 +156,7 @@ export class ShowAllCommandsAction extends Action { this.quickOpenService.show(value, { inputSelection: lastCommandPaletteInput ? { start: 1 /* after prefix */, end: value.length } : void 0 }); - return Promise.resolve(null); + return Promise.resolve(void 0); } } @@ -180,7 +180,7 @@ export class ClearCommandHistoryAction extends Action { commandCounter = 1; } - return Promise.resolve(null); + return Promise.resolve(void 0); } } @@ -205,7 +205,7 @@ class CommandPaletteEditorAction extends EditorAction { // Show with prefix quickOpenService.show(ALL_COMMANDS_PREFIX); - return Promise.resolve(null); + return Promise.resolve(void 0); } } diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts index b0fe788d1a9..32102b7988f 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts @@ -490,7 +490,7 @@ export class GotoSymbolHandler extends QuickOpenHandler { return this.cachedOutlineRequest; } - private doGetActiveOutline(): Promise { + private doGetActiveOutline(): Promise { const activeTextEditorWidget = this.editorService.activeTextEditorWidget; if (activeTextEditorWidget) { let model = activeTextEditorWidget.getModel(); diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts index 3997f637ead..558fa182e58 100644 --- a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts +++ b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts @@ -1061,7 +1061,7 @@ export class DirtyDiffModel { }); } - private getOriginalResource(): Promise { + private getOriginalResource(): Promise { if (!this._editorModel) { return Promise.resolve(null); } diff --git a/src/vs/workbench/parts/search/browser/openFileHandler.ts b/src/vs/workbench/parts/search/browser/openFileHandler.ts index 6af8b5b2a05..68fae351be9 100644 --- a/src/vs/workbench/parts/search/browser/openFileHandler.ts +++ b/src/vs/workbench/parts/search/browser/openFileHandler.ts @@ -189,7 +189,7 @@ export class OpenFileHandler extends QuickOpenHandler { }); } - private getAbsolutePathResult(query: IPreparedQuery): Promise { + private getAbsolutePathResult(query: IPreparedQuery): Promise { if (paths.isAbsolute(query.original)) { const resource = URI.file(query.original); diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts index 1f149bca5bb..d4367d89046 100644 --- a/src/vs/workbench/parts/search/browser/searchActions.ts +++ b/src/vs/workbench/parts/search/browser/searchActions.ts @@ -267,7 +267,7 @@ export class CollapseDeepestExpandedLevelAction extends Action { if (searchView) { const viewer = searchView.getControl(); if (viewer.getHighlight()) { - return Promise.resolve(null); // Global action disabled if user is in edit mode from another action + return Promise.resolve(void 0); // Global action disabled if user is in edit mode from another action } /** @@ -303,7 +303,7 @@ export class CollapseDeepestExpandedLevelAction extends Action { viewer.domFocus(); viewer.focusFirst(); } - return Promise.resolve(null); + return Promise.resolve(void 0); } } @@ -358,7 +358,7 @@ export class CancelSearchAction extends Action { searchView.cancelSearch(); } - return Promise.resolve(null); + return Promise.resolve(void 0); } } diff --git a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts index d8b0664ca86..57b61de16cd 100644 --- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts @@ -442,7 +442,7 @@ class ShowAllSymbolsAction extends Action { this.quickOpenService.show(prefix, { inputSelection }); - return Promise.resolve(null); + return Promise.resolve(void 0); } } diff --git a/src/vs/workbench/services/configuration/node/configurationService.ts b/src/vs/workbench/services/configuration/node/configurationService.ts index e770139423a..e879455a601 100644 --- a/src/vs/workbench/services/configuration/node/configurationService.ts +++ b/src/vs/workbench/services/configuration/node/configurationService.ts @@ -436,7 +436,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat if (workbenchState === WorkbenchState.WORKSPACE) { return this.workspaceConfiguration.reload().then(() => this.onWorkspaceConfigurationChanged()); } - return Promise.resolve(null); + return Promise.resolve(void 0); } private reloadWorkspaceFolderConfiguration(folder: IWorkspaceFolder, key?: string): Promise { @@ -544,7 +544,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat this.triggerConfigurationChange(workspaceConfigurationChangeEvent, ConfigurationTarget.WORKSPACE); } } - return Promise.resolve(null); + return Promise.resolve(void 0); } private onWorkspaceFolderConfigurationChanged(folder: IWorkspaceFolder, key?: string): Promise { @@ -606,7 +606,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat if (target === ConfigurationTarget.MEMORY) { this._configuration.updateValue(key, value, overrides); this.triggerConfigurationChange(new ConfigurationChangeEvent().change(overrides.overrideIdentifier ? [keyFromOverrideIdentifier(overrides.overrideIdentifier)] : [key], overrides.resource), target); - return Promise.resolve(null); + return Promise.resolve(void 0); } return this.configurationEditingService.writeConfiguration(target, { key, value }, { scopes: overrides, donotNotifyError }) diff --git a/src/vs/workbench/services/preferences/browser/preferencesService.ts b/src/vs/workbench/services/preferences/browser/preferencesService.ts index fa538e2d316..d800539e731 100644 --- a/src/vs/workbench/services/preferences/browser/preferencesService.ts +++ b/src/vs/workbench/services/preferences/browser/preferencesService.ts @@ -210,7 +210,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic this.openOrSwitchSettings2(ConfigurationTarget.USER, undefined, options, group); } - openWorkspaceSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Promise { + openWorkspaceSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Promise { jsonEditor = typeof jsonEditor === 'undefined' ? this.configurationService.getValue('workbench.settings.editor') === 'json' : jsonEditor; @@ -493,7 +493,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && target === ConfigurationTarget.WORKSPACE) { const workspaceConfig = this.contextService.getWorkspace().configuration; if (!workspaceConfig) { - return Promise.resolve(null); + return Promise.resolve(void 0); } return this.fileService.resolveContent(workspaceConfig) diff --git a/src/vs/workbench/services/progress/test/progressService.test.ts b/src/vs/workbench/services/progress/test/progressService.test.ts index 3b06a7ba65c..ae98bbd35af 100644 --- a/src/vs/workbench/services/progress/test/progressService.test.ts +++ b/src/vs/workbench/services/progress/test/progressService.test.ts @@ -29,7 +29,7 @@ class TestViewletService implements IViewletService { onDidViewletClose = this.onDidViewletCloseEmitter.event; onDidViewletEnablementChange = this.onDidViewletEnableEmitter.event; - public openViewlet(id: string, focus?: boolean): Promise { + public openViewlet(id: string, focus?: boolean): Promise { return Promise.resolve(null); } diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts index df3727422ac..a08c7388610 100644 --- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts +++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts @@ -206,7 +206,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil revert(soft?: boolean): Promise { if (!this.isResolved()) { - return Promise.resolve(null); + return Promise.resolve(void 0); } // Cancel any running auto-save @@ -483,7 +483,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil this._register(this.textEditorModel.onDidChangeContent(() => this.onModelContentChanged())); } - private doLoadBackup(backup: URI): Promise { + private doLoadBackup(backup: URI): Promise { if (!backup) { return Promise.resolve(null); } @@ -583,7 +583,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil save(options: ISaveOptions = Object.create(null)): Promise { if (!this.isResolved()) { - return Promise.resolve(null); + return Promise.resolve(void 0); } this.logService.trace('save() - enter', this.resource); @@ -622,7 +622,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil if ((!options.force && !this.dirty) || versionId !== this.versionId) { this.logService.trace(`doSave(${versionId}) - exit - because not dirty and/or versionId is different (this.isDirty: ${this.dirty}, this.versionId: ${this.versionId})`, this.resource); - return Promise.resolve(null); + return Promise.resolve(void 0); } // Return if currently saving by storing this save request as the next save that should happen. diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts index 46eb3d579da..f7605112a64 100644 --- a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts +++ b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts @@ -143,7 +143,7 @@ export class ColorThemeData implements IColorTheme { }); } } - return Promise.resolve(null); + return Promise.resolve(void 0); } /** diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts index 5086b9c4126..d5c5fa0653a 100644 --- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts +++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts @@ -271,7 +271,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService { return this.getColorTheme(); } - public setColorTheme(themeId: string, settingsTarget: ConfigurationTarget): Promise { + public setColorTheme(themeId: string, settingsTarget: ConfigurationTarget): Promise { if (!themeId) { return Promise.resolve(null); } @@ -329,7 +329,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService { _applyRules(cssRules.join('\n'), colorThemeRulesClassName); } - private applyTheme(newTheme: ColorThemeData, settingsTarget: ConfigurationTarget, silent = false): Promise { + private applyTheme(newTheme: ColorThemeData, settingsTarget: ConfigurationTarget, silent = false): Promise { if (this.container) { if (this.currentColorTheme) { removeClasses(this.container, this.currentColorTheme.id); @@ -500,16 +500,16 @@ class ConfigurationWriter { let settings = this.configurationService.inspect(key); if (settingsTarget === ConfigurationTarget.USER) { if (value === settings.user) { - return Promise.resolve(null); // nothing to do + return Promise.resolve(void 0); // nothing to do } else if (value === settings.default) { if (types.isUndefined(settings.user)) { - return Promise.resolve(null); // nothing to do + return Promise.resolve(void 0); // nothing to do } value = void 0; // remove configuration from user settings } } else if (settingsTarget === ConfigurationTarget.WORKSPACE) { if (value === settings.value) { - return Promise.resolve(null); // nothing to do + return Promise.resolve(void 0); // nothing to do } } return this.configurationService.updateValue(key, value, settingsTarget); diff --git a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts b/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts index 6ca70c16b49..4078a988a68 100644 --- a/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts +++ b/src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts @@ -166,7 +166,7 @@ class TestTelemetryService implements ITelemetryService { public publicLog(eventName: string, data?: any): Promise { this.events.push({ name: eventName, data: data }); - return Promise.resolve(null); + return Promise.resolve(void 0); } public getTelemetryInfo(): Promise {