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

rename isPromiseCanceledError to isCancellationError, nudge folks towards CancellationError instead of canceled-function

Browse Source
This commit is contained in:
Johannes Rieken
2022-01-12 14:22:36 +01:00
parent b1b2bd6c84
commit 1ab07c536a
49 changed files with 244 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vs/workbench/api/common/extHostExtensionActivator.ts
View File

@@ -29,10 +29,10 @@ export interface IExtensionAPI {
}
export type ExtensionActivationTimesFragment = {
startup?: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', isMeasurement: true };
codeLoadingTime?: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', isMeasurement: true };
activateCallTime?: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', isMeasurement: true };
activateResolvedTime?: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', isMeasurement: true };
startup?: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', isMeasurement: true; };
codeLoadingTime?: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', isMeasurement: true; };
activateCallTime?: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', isMeasurement: true; };
activateResolvedTime?: { classification: 'SystemMetaData', purpose: 'PerformanceAndHealth', isMeasurement: true; };
};
export class ExtensionActivationTimes {
@@ -168,7 +168,7 @@ export interface ExtensionActivationReason {
readonly activationEvent: string;
}
type ActivationIdAndReason = { id: ExtensionIdentifier, reason: ExtensionActivationReason };
type ActivationIdAndReason = { id: ExtensionIdentifier, reason: ExtensionActivationReason; };
export class ExtensionsActivator implements IDisposable {
@@ -414,7 +414,7 @@ export class ExtensionsActivator implements IDisposable {
error.stack = err.stack;
}
if (this._isDisposed && errors.isPromiseCanceledError(err)) {
if (this._isDisposed && errors.isCancellationError(err)) {
// It is expected for ongoing activations to fail if the extension host is going down
// So simply ignore and don't log canceled errors in this case
return new FailedExtension(err);

10
src/vs/workbench/api/common/extHostQuickOpen.ts
View File

@@ -13,7 +13,7 @@ import type { InputBox, InputBoxOptions, QuickInput, QuickInputButton, QuickPick
import { ExtHostQuickOpenShape, IMainContext, MainContext, TransferQuickInput, TransferQuickInputButton, TransferQuickPickItemOrSeparator } from './extHost.protocol';
import { URI } from 'vs/base/common/uri';
import { ThemeIcon, QuickInputButtons, QuickPickItemKind } from 'vs/workbench/api/common/extHostTypes';
import { isPromiseCanceledError } from 'vs/base/common/errors';
import { isCancellationError } from 'vs/base/common/errors';
import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';
import { coalesce } from 'vs/base/common/arrays';
import Severity from 'vs/base/common/severity';
@@ -30,7 +30,7 @@ export interface ExtHostQuickOpen {
showInput(options?: InputBoxOptions, token?: CancellationToken): Promise<string | undefined>;
showWorkspaceFolderPick(options?: WorkspaceFolderPickOptions, token?: CancellationToken): Promise<WorkspaceFolder | undefined>
showWorkspaceFolderPick(options?: WorkspaceFolderPickOptions, token?: CancellationToken): Promise<WorkspaceFolder | undefined>;
createQuickPick<T extends QuickPickItem>(extensionId: IExtensionDescription): QuickPick<T>;
@@ -127,7 +127,7 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
});
});
}).then(undefined, err => {
if (isPromiseCanceledError(err)) {
if (isCancellationError(err)) {
return undefined;
}
@@ -152,7 +152,7 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
return proxy.$input(options, typeof this._validateInput === 'function', token)
.then(undefined, err => {
if (isPromiseCanceledError(err)) {
if (isCancellationError(err)) {
return undefined;
}
@@ -469,7 +469,7 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
}
}
function getIconUris(iconPath: QuickInputButton['iconPath']): { dark: URI, light?: URI } | { id: string } {
function getIconUris(iconPath: QuickInputButton['iconPath']): { dark: URI, light?: URI; } | { id: string; } {
if (iconPath instanceof ThemeIcon) {
return { id: iconPath.id };
}

4
src/vs/workbench/api/common/shared/workspaceContains.ts
View File

@@ -96,7 +96,7 @@ async function _activateIfGlobPatterns(host: IExtensionActivationHost, extension
try {
exists = await searchP;
} catch (err) {
if (!errors.isPromiseCanceledError(err)) {
if (!errors.isCancellationError(err)) {
errors.onUnexpectedError(err);
}
}
@@ -130,7 +130,7 @@ export function checkGlobFileExists(
return !!result.limitHit;
},
err => {
if (!errors.isPromiseCanceledError(err)) {
if (!errors.isCancellationError(err)) {
return Promise.reject(err);
}