Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-28 16:39:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename to not have two different RunOptions

Browse Source
This commit is contained in:
Alex Ross
2018-11-23 16:29:02 +01:00
parent 0e86dd639b
commit 779e2df6f7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/parts/tasks/browser/quickOpen.ts
+2 -2
View File
@@ -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();
src/vs/workbench/parts/tasks/common/taskService.ts
+2 -2
View File
@@ -23,7 +23,7 @@ export interface ITaskProvider {
provideTasks(validTypes: IStringDictionary<boolean>): TPromise<TaskSet>;
}
export interface RunOptions {
export interface ProblemMatcherRunOptions {
attachProblemMatcher?: boolean;
}
@@ -46,7 +46,7 @@ export interface ITaskService {
configureAction(): Action;
build(): TPromise<ITaskSummary>;
runTest(): TPromise<ITaskSummary>;
run(task: Task, options?: RunOptions): TPromise<ITaskSummary>;
run(task: Task, options?: ProblemMatcherRunOptions): TPromise<ITaskSummary>;
inTerminal(): boolean;
isActive(): TPromise<boolean>;
getActiveTasks(): TPromise<Task[]>;
src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
+2 -2
View File
@@ -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<ITaskSummary> {
public run(task: Task, options?: ProblemMatcherRunOptions): TPromise<ITaskSummary> {
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);