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

Prefer to use .then(void 0, ..) over .then(null, ..)

Browse Source 
ES6 promises like using undefined as their first argument instead of null. Both should behave the same behavior
This commit is contained in:
Matt Bierner
2018-12-11 21:59:32 -08:00
parent a256e72786
commit 0b1d0da7af
39 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,7 +341,7 @@ export class ExtensionsActivator {
return this._activatingExtensions[extensionDescription.id];
}
this._activatingExtensions[extensionDescription.id] = this._host.actualActivateExtension(extensionDescription, reason).then(null, (err) => {
this._activatingExtensions[extensionDescription.id] = this._host.actualActivateExtension(extensionDescription, reason).then(void 0, (err) => {
this._host.showMessage(Severity.Error, nls.localize('activationError', "Activating extension '{0}' failed: {1}.", extensionDescription.id, err.message));
console.error('Activating extension `' + extensionDescription.id + '` failed: ', err.message);
console.log('Here is the error stack: ', err.stack);

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

@@ -319,7 +319,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
// call deactivate if available
try {
if (typeof extension.module.deactivate === 'function') {
result = Promise.resolve(extension.module.deactivate()).then(null, (err) => {
result = Promise.resolve(extension.module.deactivate()).then(void 0, (err) => {
// TODO: Do something with err if this is not the shutdown case
return Promise.resolve(void 0);
});
@@ -465,7 +465,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
// Handle "eager" activation extensions
private _handleEagerExtensions(): Promise<void> {
this._activateByEvent('*', true).then(null, (err) => {
this._activateByEvent('*', true).then(void 0, (err) => {
console.error(err);
});
@@ -522,7 +522,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
// the file was found
return (
this._activateById(extensionId, new ExtensionActivatedByEvent(true, `workspaceContains:${fileName}`))
.then(null, err => console.error(err))
.then(void 0, err => console.error(err))
);
}
}
@@ -543,7 +543,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
const timer = setTimeout(async () => {
tokenSource.cancel();
this._activateById(extensionId, new ExtensionActivatedByEvent(true, `workspaceContainsTimeout:${globPatterns.join(',')}`))
.then(null, err => console.error(err));
.then(void 0, err => console.error(err));
}, ExtHostExtensionService.WORKSPACE_CONTAINS_TIMEOUT);
let exists: boolean;
@@ -562,7 +562,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
// a file was found matching one of the glob patterns
return (
this._activateById(extensionId, new ExtensionActivatedByEvent(true, `workspaceContains:${globPatterns.join(',')}`))
.then(null, err => console.error(err))
.then(void 0, err => console.error(err))
);
}

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

@@ -114,7 +114,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
return undefined;
});
});
}).then(null, err => {
}).then(void 0, err => {
if (isPromiseCanceledError(err)) {
return undefined;
}
@@ -139,7 +139,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
this._validateInput = options && options.validateInput;
return this._proxy.$input(options, typeof this._validateInput === 'function', token)
.then(null, err => {
.then(void 0, err => {
if (isPromiseCanceledError(err)) {
return undefined;
}

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

@@ -604,7 +604,7 @@ export class ExtHostTextEditor implements vscode.TextEditor {
}
function warnOnError(promise: Thenable<any>): void {
promise.then(null, (err) => {
promise.then(void 0, (err) => {
console.warn(err);
});
}

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

@@ -232,7 +232,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape {
// Trigger on main side
if (this._proxy) {
const extName = extension.displayName || extension.name;
this._proxy.$updateWorkspaceFolders(extName, index, deleteCount, validatedDistinctWorkspaceFoldersToAdd).then(null, error => {
this._proxy.$updateWorkspaceFolders(extName, index, deleteCount, validatedDistinctWorkspaceFoldersToAdd).then(void 0, error => {
// in case of an error, make sure to clear out the unconfirmed workspace
// because we cannot expect the acknowledgement from the main side for this