development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-13 23:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tasks.json changes not updated when using terminal runner.

Browse source
This commit is contained in:
Dirk Baeumer 2017-01-26 10:16:38 +01:00
parent 6ba4282fd2
commit 291881c86d
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/vs/workbench/parts/tasks/common/problemCollectors.ts
View file

@ -51,6 +51,7 @@ export class AbstractProblemCollector extends EventEmitter implements IDisposabl
}); });
this.buffer = []; this.buffer = [];
this.activeMatcher = null; this.activeMatcher = null;
this._numberOfMatches = 0;
this.openModels = Object.create(null); this.openModels = Object.create(null);
this.modelListeners = []; this.modelListeners = [];
this.modelService.onModelAdded((model) => { this.modelService.onModelAdded((model) => {

9
src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
View file

@ -683,7 +683,7 @@ class TaskService extends EventEmitter implements ITaskService {
this.outputChannel = this.outputService.getChannel(TaskService.OutputChannelId); this.outputChannel = this.outputService.getChannel(TaskService.OutputChannelId);
this.configurationService.onDidUpdateConfiguration(() => { this.configurationService.onDidUpdateConfiguration(() => {
// We don't have a task system yet. So nothing to do. // We don't have a task system yet. So nothing to do.
if (!this._taskSystem) { if (!this._taskSystemPromise && !this._taskSystem) {
return; return;
} }
if (this._inTerminal !== void 0) { if (this._inTerminal !== void 0) {
@ -698,7 +698,12 @@ class TaskService extends EventEmitter implements ITaskService {
if (!config) { if (!config) {
return; return;
} }
(this._taskSystem as TerminalTaskSystem).setConfiguration(config); if (this._taskSystem) {
(this._taskSystem as TerminalTaskSystem).setConfiguration(config);
} else {
this._taskSystem = null;
this._taskSystemPromise = null;
}
}); });
} else { } else {
if (this._taskSystem && this._taskSystem.isActiveSync()) { if (this._taskSystem && this._taskSystem.isActiveSync()) {