Tasks.json changes not updated when using terminal runner.

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

View file

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

View file

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