development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-04 02:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: use CancellationToken.None (#206115)

Browse source
This commit is contained in:
Joyce Er 2024-02-23 10:37:02 -08:00 committed by GitHub
parent 3bee3f48a5
commit 25bc3dfec4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/workbench/api/browser/mainThreadShare.ts
View file

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { CancellationTokenSource } from 'vs/base/common/cancellation';
import { CancellationToken } from 'vs/base/common/cancellation';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { URI } from 'vs/base/common/uri';
import { ExtHostContext, ExtHostShareShape, IDocumentFilterDto, MainContext, MainThreadShareShape } from 'vs/workbench/api/common/extHost.protocol';
@ -31,7 +31,7 @@ export class MainThreadShare implements MainThreadShareShape {
selector,
priority,
provideShare: async (item: IShareableItem) => {
const result = await this.proxy.$provideShare(handle, item, new CancellationTokenSource().token);
const result = await this.proxy.$provideShare(handle, item, CancellationToken.None);
return typeof result === 'string' ? result : URI.revive(result);
}
};

4
src/vs/workbench/contrib/editSessions/test/browser/editSessions.test.ts
View file

@ -37,7 +37,7 @@ import { ITextModelService } from 'vs/editor/common/services/resolverService';
import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { IDialogService, IPrompt } from 'vs/platform/dialogs/common/dialogs';
import { IEditorService, ISaveAllEditorsOptions } from 'vs/workbench/services/editor/common/editorService';
import { CancellationTokenSource } from 'vs/base/common/cancellation';
import { CancellationToken } from 'vs/base/common/cancellation';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
@ -213,7 +213,7 @@ suite('Edit session sync', () => {
// Create root folder
await fileService.createFolder(folderUri);
await editSessionsContribution.storeEditSession(true, new CancellationTokenSource().token);
await editSessionsContribution.storeEditSession(true, CancellationToken.None);
// Verify that we did not attempt to write the edit session
assert.equal(writeStub.called, false);

4
src/vs/workbench/contrib/share/browser/share.contribution.ts
View file

@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import 'vs/css!./share';
import { CancellationTokenSource } from 'vs/base/common/cancellation';
import { CancellationToken } from 'vs/base/common/cancellation';
import { Codicon } from 'vs/base/common/codicons';
import { MarkdownString } from 'vs/base/common/htmlContent';
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
@ -110,7 +110,7 @@ class ShareWorkbenchContribution {
const result = await progressService.withProgress({
location: ProgressLocation.Window,
detail: localize('generating link', 'Generating link...')
}, async () => shareService.provideShare({ resourceUri, selection }, new CancellationTokenSource().token));
}, async () => shareService.provideShare({ resourceUri, selection }, CancellationToken.None));
if (result) {
const uriText = result.toString();