提交 b8e4e03b 编写于 作者: I isidor

debug: do not listen on task active event not needed

fixes #57346
上级 f6c98dfa
...@@ -56,6 +56,18 @@ const DEBUG_FUNCTION_BREAKPOINTS_KEY = 'debug.functionbreakpoint'; ...@@ -56,6 +56,18 @@ const DEBUG_FUNCTION_BREAKPOINTS_KEY = 'debug.functionbreakpoint';
const DEBUG_EXCEPTION_BREAKPOINTS_KEY = 'debug.exceptionbreakpoint'; const DEBUG_EXCEPTION_BREAKPOINTS_KEY = 'debug.exceptionbreakpoint';
const DEBUG_WATCH_EXPRESSIONS_KEY = 'debug.watchexpressions'; const DEBUG_WATCH_EXPRESSIONS_KEY = 'debug.watchexpressions';
function once(kind: TaskEventKind, event: Event<TaskEvent>): Event<TaskEvent> {
return (listener, thisArgs = null, disposables?) => {
const result = event(e => {
if (e.kind === kind) {
result.dispose();
return listener.call(thisArgs, e);
}
}, null, disposables);
return result;
};
}
export class DebugService implements IDebugService { export class DebugService implements IDebugService {
_serviceBrand: any; _serviceBrand: any;
...@@ -695,17 +707,6 @@ export class DebugService implements IDebugService { ...@@ -695,17 +707,6 @@ export class DebugService implements IDebugService {
return TPromise.wrapError(errors.create(errorMessage)); return TPromise.wrapError(errors.create(errorMessage));
} }
function once(kind: TaskEventKind, event: Event<TaskEvent>): Event<TaskEvent> {
return (listener, thisArgs = null, disposables?) => {
const result = event(e => {
if (e.kind === kind) {
result.dispose();
return listener.call(thisArgs, e);
}
}, null, disposables);
return result;
};
}
// If a task is missing the problem matcher the promise will never complete, so we need to have a workaround #35340 // If a task is missing the problem matcher the promise will never complete, so we need to have a workaround #35340
let taskStarted = false; let taskStarted = false;
const promise = this.taskService.getActiveTasks().then(tasks => { const promise = this.taskService.getActiveTasks().then(tasks => {
...@@ -713,12 +714,12 @@ export class DebugService implements IDebugService { ...@@ -713,12 +714,12 @@ export class DebugService implements IDebugService {
// task is already running - nothing to do. // task is already running - nothing to do.
return TPromise.as(null); return TPromise.as(null);
} }
once(TaskEventKind.Active, this.taskService.onDidStateChange)((taskEvent) => {
taskStarted = true;
});
const taskPromise = this.taskService.run(task); const taskPromise = this.taskService.run(task);
if (task.isBackground) { if (task.isBackground) {
return new TPromise((c, e) => once(TaskEventKind.Inactive, this.taskService.onDidStateChange)(() => c(null))); return new TPromise((c, e) => once(TaskEventKind.Inactive, this.taskService.onDidStateChange)(() => {
taskStarted = true;
c(null);
}));
} }
return taskPromise; return taskPromise;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册