maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #128686 from suzmue/sort

Browse source 
Sort threads in response order
This commit is contained in:
Isidor Nikolic 2021-08-02 12:26:27 +02:00 committed by GitHub
parent 11d8d9546a 7b67e477d8
commit d8d7e1bf4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/vs/workbench/contrib/debug/browser/debugSession.ts
View file

@ -47,6 +47,7 @@ export class DebugSession implements IDebugSession {
private sources = new Map<string, Source>();
private threads = new Map<number, Thread>();
private threadIds: number[] = [];
private cancellationMap = new Map<number, CancellationTokenSource[]>();
private rawListeners: IDisposable[] = [];
private fetchThreadsScheduler: RunOnceScheduler | undefined;
@ -738,7 +739,12 @@ export class DebugSession implements IDebugSession {
getAllThreads(): IThread[] {
const result: IThread[] = [];
this.threads.forEach(t => result.push(t));
this.threadIds.forEach((threadId) => {
const thread = this.threads.get(threadId);
if (thread) {
result.push(thread);
}
});
return result;
}
@ -763,6 +769,7 @@ export class DebugSession implements IDebugSession {
if (removeThreads) {
this.threads.clear();
this.threadIds = [];
ExpressionContainer.allValues.clear();
}
}
@ -773,9 +780,9 @@ export class DebugSession implements IDebugSession {
}
rawUpdate(data: IRawModelUpdate): void {
const threadIds: number[] = [];
this.threadIds = [];
data.threads.forEach(thread => {
threadIds.push(thread.id);
this.threadIds.push(thread.id);
if (!this.threads.has(thread.id)) {
// A new thread came in, initialize it.
this.threads.set(thread.id, new Thread(this, thread.name, thread.id));
@ -789,7 +796,7 @@ export class DebugSession implements IDebugSession {
});
this.threads.forEach(t => {
// Remove all old threads which are no longer part of the update #75980
if (threadIds.indexOf(t.threadId) === -1) {
if (this.threadIds.indexOf(t.threadId) === -1) {
this.threads.delete(t.threadId);
}
});