提交 779e2df6 编写于 作者: A Alex Ross

Rename to not have two different RunOptions

上级 0e86dd63
...@@ -15,7 +15,7 @@ import * as Model from 'vs/base/parts/quickopen/browser/quickOpenModel'; ...@@ -15,7 +15,7 @@ import * as Model from 'vs/base/parts/quickopen/browser/quickOpenModel';
import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
import { Task, CustomTask, ContributedTask } from 'vs/workbench/parts/tasks/common/tasks'; 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 { ActionBarContributor, ContributableActionProvider } from 'vs/workbench/browser/actions';
import { CancellationToken } from 'vs/base/common/cancellation'; import { CancellationToken } from 'vs/base/common/cancellation';
...@@ -48,7 +48,7 @@ export class TaskEntry extends Model.QuickOpenEntry { ...@@ -48,7 +48,7 @@ export class TaskEntry extends Model.QuickOpenEntry {
return this._task; return this._task;
} }
protected doRun(task: CustomTask | ContributedTask, options?: RunOptions): boolean { protected doRun(task: CustomTask | ContributedTask, options?: ProblemMatcherRunOptions): boolean {
this.taskService.run(task, options); this.taskService.run(task, options);
if (!task.command || task.command.presentation.focus) { if (!task.command || task.command.presentation.focus) {
this.quickOpenService.close(); this.quickOpenService.close();
......
...@@ -23,7 +23,7 @@ export interface ITaskProvider { ...@@ -23,7 +23,7 @@ export interface ITaskProvider {
provideTasks(validTypes: IStringDictionary<boolean>): TPromise<TaskSet>; provideTasks(validTypes: IStringDictionary<boolean>): TPromise<TaskSet>;
} }
export interface RunOptions { export interface ProblemMatcherRunOptions {
attachProblemMatcher?: boolean; attachProblemMatcher?: boolean;
} }
...@@ -46,7 +46,7 @@ export interface ITaskService { ...@@ -46,7 +46,7 @@ export interface ITaskService {
configureAction(): Action; configureAction(): Action;
build(): TPromise<ITaskSummary>; build(): TPromise<ITaskSummary>;
runTest(): TPromise<ITaskSummary>; runTest(): TPromise<ITaskSummary>;
run(task: Task, options?: RunOptions): TPromise<ITaskSummary>; run(task: Task, options?: ProblemMatcherRunOptions): TPromise<ITaskSummary>;
inTerminal(): boolean; inTerminal(): boolean;
isActive(): TPromise<boolean>; isActive(): TPromise<boolean>;
getActiveTasks(): TPromise<Task[]>; getActiveTasks(): TPromise<Task[]>;
......
...@@ -76,7 +76,7 @@ import { ...@@ -76,7 +76,7 @@ import {
TaskEventKind, TaskSet, TaskGroup, GroupType, ExecutionEngine, JsonSchemaVersion, TaskSourceKind, TaskEventKind, TaskSet, TaskGroup, GroupType, ExecutionEngine, JsonSchemaVersion, TaskSourceKind,
TaskSorter, TaskIdentifier, KeyedTaskIdentifier, TASK_RUNNING_STATE, RerunBehavior TaskSorter, TaskIdentifier, KeyedTaskIdentifier, TASK_RUNNING_STATE, RerunBehavior
} from 'vs/workbench/parts/tasks/common/tasks'; } 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 { getTemplates as getTaskTemplates } from 'vs/workbench/parts/tasks/common/taskTemplates';
import { KeyedTaskIdentifier as NKeyedTaskIdentifier, TaskDefinition } from 'vs/workbench/parts/tasks/node/tasks'; import { KeyedTaskIdentifier as NKeyedTaskIdentifier, TaskDefinition } from 'vs/workbench/parts/tasks/node/tasks';
...@@ -848,7 +848,7 @@ class TaskService extends Disposable implements ITaskService { ...@@ -848,7 +848,7 @@ class TaskService extends Disposable implements ITaskService {
}); });
} }
public run(task: Task, options?: RunOptions): TPromise<ITaskSummary> { public run(task: Task, options?: ProblemMatcherRunOptions): TPromise<ITaskSummary> {
return this.getGroupedTasks().then((grouped) => { return this.getGroupedTasks().then((grouped) => {
if (!task) { if (!task) {
throw new TaskError(Severity.Info, nls.localize('TaskServer.noTask', 'Requested task {0} to execute not found.', task.name), TaskErrors.TaskNotFound); throw new TaskError(Severity.Info, nls.localize('TaskServer.noTask', 'Requested task {0} to execute not found.', task.name), TaskErrors.TaskNotFound);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册