Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve queues, (one effect: improve code completion) #4310

Merged
merged 8 commits into from
Jan 4, 2021
Merged

improve queues, (one effect: improve code completion) #4310

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
954ce95
call dequeue when cancelRequest is called
an-dr-eas-k Dec 21, 2020
0a403e0
remove logging again
an-dr-eas-k Dec 21, 2020
2dbfad6
update commands for normal queue
an-dr-eas-k Dec 21, 2020
25e6413
add cancelevent
an-dr-eas-k Dec 29, 2020
10b1e7b
add slots to request start event
an-dr-eas-k Dec 29, 2020
860e244
call OnError, update debug logging
an-dr-eas-k Dec 30, 2020
d7c2787
adjust format
an-dr-eas-k Dec 30, 2020
aa6fe5e
requested changes
an-dr-eas-k Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/omnisharp/prioritization.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ const priorityCommands = [
];

const normalCommands = [
protocol.Requests.Completion,
protocol.Requests.CompletionResolve,
protocol.Requests.AutoComplete,
an-dr-eas-k marked this conversation as resolved.
Show resolved Hide resolved
protocol.Requests.FilesChanged,
protocol.Requests.FindSymbols,
Expand Down
5 changes: 4 additions & 1 deletion src/omnisharp/requestQueue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export interface Request {
onError(err: any): void;
startTime?: number;
endTime?: number;
id?: number;
}

/**
Expand Down Expand Up @@ -62,7 +63,9 @@ class RequestQueue {
request.onError(new Error(`Pending request cancelled: ${request.command}`));
}

// TODO: Handle cancellation of a request already waiting on the OmniSharp server.
if (request.id){
this.dequeue(request.id);
}
}

/**
Expand Down
3 changes: 2 additions & 1 deletion src/omnisharp/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,8 @@ export class OmniSharpServer {

private _makeRequest(request: Request) {
const id = OmniSharpServer._nextId++;

request.id = id;

333fred marked this conversation as resolved.
Show resolved Hide resolved
const requestPacket: protocol.WireProtocol.RequestPacket = {
Type: 'request',
Seq: id,
Expand Down