Skip to content

Commit d7ef1f1

Browse files
CR feedback: use server.makeRequest<T>'s proper cancellation token handling
1 parent 61c60dc commit d7ef1f1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/features/completionItemProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ export default class OmniSharpCompletionItemProvider extends AbstractSupport imp
4141
}
4242

4343
try {
44-
let responses = await serverUtils.autoComplete(this._server, req);
44+
let responses = await serverUtils.autoComplete(this._server, req, token);
4545

46-
if (!responses || token && token.isCancellationRequested) {
46+
if (!responses) {
4747
return;
4848
}
4949

src/omnisharp/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { OmniSharpServer } from './server';
77
import * as protocol from './protocol';
88
import * as vscode from 'vscode';
99

10-
export async function autoComplete(server: OmniSharpServer, request: protocol.AutoCompleteRequest) {
11-
return server.makeRequest<protocol.AutoCompleteResponse[]>(protocol.Requests.AutoComplete, request);
10+
export async function autoComplete(server: OmniSharpServer, request: protocol.AutoCompleteRequest, token: vscode.CancellationToken) {
11+
return server.makeRequest<protocol.AutoCompleteResponse[]>(protocol.Requests.AutoComplete, request, token);
1212
}
1313

1414
export async function codeCheck(server: OmniSharpServer, request: protocol.Request, token: vscode.CancellationToken) {

0 commit comments

Comments
 (0)