提交 b8e7d093 编写于 作者: D Dirk Baeumer

Fixes #59102: Tasks with scope = the last folder in workspaceFolders array do not show up

上级 0edcbadb
...@@ -494,13 +494,10 @@ class TaskService implements ITaskService { ...@@ -494,13 +494,10 @@ class TaskService implements ITaskService {
this._outputChannel = this.outputService.getChannel(TaskService.OutputChannelId); this._outputChannel = this.outputService.getChannel(TaskService.OutputChannelId);
this._providers = new Map<number, ITaskProvider>(); this._providers = new Map<number, ITaskProvider>();
this._taskSystemInfos = new Map<string, TaskSystemInfo>(); this._taskSystemInfos = new Map<string, TaskSystemInfo>();
this.configurationService.onDidChangeConfiguration(() => { this.contextService.onDidChangeWorkspaceFolders(() => {
if (!this._taskSystem && !this._workspaceTasksPromise) { if (!this._taskSystem && !this._workspaceTasksPromise) {
return; return;
} }
if (!this._taskSystem || this._taskSystem instanceof TerminalTaskSystem) {
this._outputChannel.clear();
}
let folderSetup = this.computeWorkspaceFolderSetup(); let folderSetup = this.computeWorkspaceFolderSetup();
if (this.executionEngine !== folderSetup[2]) { if (this.executionEngine !== folderSetup[2]) {
if (this._taskSystem && this._taskSystem.getActiveTasks().length > 0) { if (this._taskSystem && this._taskSystem.getActiveTasks().length > 0) {
...@@ -524,6 +521,15 @@ class TaskService implements ITaskService { ...@@ -524,6 +521,15 @@ class TaskService implements ITaskService {
this.updateSetup(folderSetup); this.updateSetup(folderSetup);
this.updateWorkspaceTasks(); this.updateWorkspaceTasks();
}); });
this.configurationService.onDidChangeConfiguration(() => {
if (!this._taskSystem && !this._workspaceTasksPromise) {
return;
}
if (!this._taskSystem || this._taskSystem instanceof TerminalTaskSystem) {
this._outputChannel.clear();
}
this.updateWorkspaceTasks();
});
this._taskRunningState = TASK_RUNNING_STATE.bindTo(contextKeyService); this._taskRunningState = TASK_RUNNING_STATE.bindTo(contextKeyService);
lifecycleService.onWillShutdown(event => event.veto(this.beforeShutdown())); lifecycleService.onWillShutdown(event => event.veto(this.beforeShutdown()));
this._onDidStateChange = new Emitter(); this._onDidStateChange = new Emitter();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册