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

Review uses of Promise.resolve(null)

Browse Source 
Many `Promise.resolve(null)` should actually be `Promise.resolve(void 0)`. In other cases, we were missing a null return annotation.
This commit is contained in:
Matt Bierner
2018-12-13 15:41:13 -08:00
parent 68a4e01246
commit d40fa4a27e
48 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/api/node/extHostComments.ts
View File

@@ -67,7 +67,7 @@ export class ExtHostComments implements ExtHostCommentsShape {
};
}
$createNewCommentThread(handle: number, uri: UriComponents, range: IRange, text: string): Promise<modes.CommentThread> {
$createNewCommentThread(handle: number, uri: UriComponents, range: IRange, text: string): Promise<modes.CommentThread | null> {
const data = this._documents.getDocumentData(URI.revive(uri));
const ran = <vscode.Range>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<modes.CommentThread> {
$replyToCommentThread(handle: number, uri: UriComponents, range: IRange, thread: modes.CommentThread, text: string): Promise<modes.CommentThread | null> {
const data = this._documents.getDocumentData(URI.revive(uri));
const ran = <vscode.Range>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<modes.CommentThread[]> {
$provideWorkspaceComments(handle: number): Promise<modes.CommentThread[] | null> {
const provider = this._workspaceProviders.get(handle);
if (!provider) {
return Promise.resolve(null);

4
src/vs/workbench/api/node/extHostExtensionService.ts
View File

@@ -475,7 +475,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
private _handleWorkspaceContainsEagerExtensions(workspace: IWorkspaceData): Promise<void> {
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<void> {
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

14
src/vs/workbench/api/node/extHostSCM.ts
View File

@@ -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<UriComponents> {
$provideOriginalResource(sourceControlHandle: number, uriComponents: UriComponents, token: CancellationToken): Promise<UriComponents | null> {
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<void> {
@@ -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);
}
}

2
src/vs/workbench/api/node/extHostTreeViews.ts
View File

@@ -341,7 +341,7 @@ class ExtHostTreeView<T> extends Disposable {
return this.refreshHandles(handlesToRefresh);
}
}
return Promise.resolve(null);
return Promise.resolve(void 0);
}
private getHandlesToRefresh(elements: T[]): TreeItemHandle[] {

4
src/vs/workbench/api/node/extHostUrls.ts
View File

@@ -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);
}
}