Updates

Author: DonJayamanne

src/client/common/cancellation.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 'use strict';
 
-import { CancellationToken, CancellationTokenSource } from 'vscode';
+import { CancellationToken, CancellationTokenSource, CancellationError as VSCCancellationError } from 'vscode';
 import { createDeferred } from './utils/async';
 import * as localize from './utils/localize';
 
@@ -13,6 +13,10 @@ export class CancellationError extends Error {
     constructor() {
         super(localize.Common.canceled);
     }
+
+    static isCancellationError(error: unknown): error is CancellationError {
+        return error instanceof CancellationError || error instanceof VSCCancellationError;
+    }
 }
 /**
  * Create a promise that will either resolve with a default value or reject when the token is cancelled.

src/client/common/utils/async.ts

@@ -5,9 +5,6 @@
 
 'use strict';
 
-import type { CancellationToken } from 'vscode';
-import { CancellationError } from 'vscode';
-
 export async function sleep(timeout: number): Promise<number> {
     return new Promise<number>((resolve) => {
         setTimeout(() => resolve(timeout), timeout);
@@ -271,17 +268,3 @@ export async function waitForCondition(
         }, 10);
     });
 }
-
-/**
- * Returns a promise that rejects with an {@CancellationError} as soon as the passed token is cancelled.
- * @see {@link raceCancellation}
- */
-export function raceCancellationError<T>(promise: Promise<T>, token: CancellationToken): Promise<T> {
-    return new Promise((resolve, reject) => {
-        const ref = token.onCancellationRequested(() => {
-            ref.dispose();
-            reject(new CancellationError());
-        });
-        promise.then(resolve, reject).finally(() => ref.dispose());
-    });
-}