diff --git a/src/vs/workbench/parts/tasks/browser/quickOpen.ts b/src/vs/workbench/parts/tasks/browser/quickOpen.ts index 821080f187d..7c276b8568a 100644 --- a/src/vs/workbench/parts/tasks/browser/quickOpen.ts +++ b/src/vs/workbench/parts/tasks/browser/quickOpen.ts @@ -15,7 +15,7 @@ import * as Model from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { Task, CustomTask, ContributedTask } from 'vs/workbench/parts/tasks/common/tasks'; -import { ITaskService, RunOptions } from 'vs/workbench/parts/tasks/common/taskService'; +import { ITaskService, ProblemMatcherRunOptions } from 'vs/workbench/parts/tasks/common/taskService'; import { ActionBarContributor, ContributableActionProvider } from 'vs/workbench/browser/actions'; import { CancellationToken } from 'vs/base/common/cancellation'; @@ -48,7 +48,7 @@ export class TaskEntry extends Model.QuickOpenEntry { return this._task; } - protected doRun(task: CustomTask | ContributedTask, options?: RunOptions): boolean { + protected doRun(task: CustomTask | ContributedTask, options?: ProblemMatcherRunOptions): boolean { this.taskService.run(task, options); if (!task.command || task.command.presentation.focus) { this.quickOpenService.close(); diff --git a/src/vs/workbench/parts/tasks/common/taskService.ts b/src/vs/workbench/parts/tasks/common/taskService.ts index 6eed335a670..52b4996ee4e 100644 --- a/src/vs/workbench/parts/tasks/common/taskService.ts +++ b/src/vs/workbench/parts/tasks/common/taskService.ts @@ -23,7 +23,7 @@ export interface ITaskProvider { provideTasks(validTypes: IStringDictionary): TPromise; } -export interface RunOptions { +export interface ProblemMatcherRunOptions { attachProblemMatcher?: boolean; } @@ -46,7 +46,7 @@ export interface ITaskService { configureAction(): Action; build(): TPromise; runTest(): TPromise; - run(task: Task, options?: RunOptions): TPromise; + run(task: Task, options?: ProblemMatcherRunOptions): TPromise; inTerminal(): boolean; isActive(): TPromise; getActiveTasks(): TPromise; diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts index 156acce0ee0..24cec26050b 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts @@ -76,7 +76,7 @@ import { TaskEventKind, TaskSet, TaskGroup, GroupType, ExecutionEngine, JsonSchemaVersion, TaskSourceKind, TaskSorter, TaskIdentifier, KeyedTaskIdentifier, TASK_RUNNING_STATE, RerunBehavior } from 'vs/workbench/parts/tasks/common/tasks'; -import { ITaskService, ITaskProvider, RunOptions, CustomizationProperties, TaskFilter } from 'vs/workbench/parts/tasks/common/taskService'; +import { ITaskService, ITaskProvider, ProblemMatcherRunOptions, CustomizationProperties, TaskFilter } from 'vs/workbench/parts/tasks/common/taskService'; import { getTemplates as getTaskTemplates } from 'vs/workbench/parts/tasks/common/taskTemplates'; import { KeyedTaskIdentifier as NKeyedTaskIdentifier, TaskDefinition } from 'vs/workbench/parts/tasks/node/tasks'; @@ -848,7 +848,7 @@ class TaskService extends Disposable implements ITaskService { }); } - public run(task: Task, options?: RunOptions): TPromise { + public run(task: Task, options?: ProblemMatcherRunOptions): TPromise { return this.getGroupedTasks().then((grouped) => { if (!task) { throw new TaskError(Severity.Info, nls.localize('TaskServer.noTask', 'Requested task {0} to execute not found.', task.name), TaskErrors.TaskNotFound);