Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 03:29:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implements #27399: Separate the task provider name from the task name in the task API

Browse Source
This commit is contained in:
Dirk Baeumer
2017-05-29 14:44:01 +02:00
parent 7c3f873bed
commit e58c2abb97
13 changed files with 88 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/api/node/extHostTask.ts
View File

@@ -310,7 +310,11 @@ namespace Tasks {
}
let result: TaskSystem.Task = {
_id: uuidMap.getUUID(task.identifier),
_source: { kind: TaskSystem.TaskSourceKind.Extension, detail: extension.id },
_source: {
kind: TaskSystem.TaskSourceKind.Extension,
label: typeof task.source === 'string' ? task.source : extension.name,
detail: extension.id
},
name: task.name,
identifier: task.identifier,
group: types.TaskGroup.is(task.group) ? task.group : undefined,

58
src/vs/workbench/api/node/extHostTypes.ts
View File

@@ -1021,6 +1021,8 @@ export class BaseTask {
private _problemMatchers: string[];
private _identifier: string;
private _isBackground: boolean;
private _source: string;
private _group: string;
private _terminal: vscode.TerminalBehaviour;
constructor(name: string, problemMatchers: string[]) {
@@ -1063,6 +1065,36 @@ export class BaseTask {
this._isBackground = value;
}
get source(): string {
return this._source;
}
set source(value: string) {
if (value === void 0 || value === null) {
this._source = undefined;
return;
}
if (typeof value !== 'string' || value.length === 0) {
throw illegalArgument('source must be a string of length > 0');
}
this._source = value;
}
get group(): string {
return this._group;
}
set group(value: string) {
if (value === void 0 || value === null) {
this._group = undefined;
return;
}
if (typeof value !== 'string' || value.length === 0) {
throw illegalArgument('group must be a string of length > 0');
}
this._group = value;
}
get terminal(): vscode.TerminalBehaviour {
return this._terminal;
}
@@ -1122,7 +1154,7 @@ export namespace TaskGroup {
*/
export const Test: 'test' = 'test';
export function is(value: string): value is vscode.TaskGroup {
export function is(value: string): value is string {
return value === Clean || value === Build || value === RebuildAll || value === Test;
}
}
@@ -1131,7 +1163,6 @@ export class ProcessTask extends BaseTask {
private _process: string;
private _args: string[];
private _group: vscode.TaskGroup;
private _options: vscode.ProcessOptions;
constructor(name: string, process: string, args?: string[], problemMatchers?: vscode.ProblemMatchers);
@@ -1183,17 +1214,6 @@ export class ProcessTask extends BaseTask {
this._args = value;
}
get group(): vscode.TaskGroup {
return this._group;
}
set group(value: vscode.TaskGroup) {
if (!TaskGroup.is(value)) {
throw illegalArgument('group');
}
this._group = value;
}
get options(): vscode.ProcessOptions {
return this._options;
}
@@ -1209,7 +1229,6 @@ export class ProcessTask extends BaseTask {
export class ShellTask extends BaseTask implements vscode.ShellTask {
private _commandLine: string;
private _group: vscode.TaskGroup;
private _options: vscode.ShellOptions;
constructor(name: string, commandLine: string, problemMatchers?: vscode.ProblemMatchers);
@@ -1240,17 +1259,6 @@ export class ShellTask extends BaseTask implements vscode.ShellTask {
return this._commandLine;
}
get group(): vscode.TaskGroup {
return this._group;
}
set group(value: vscode.TaskGroup) {
if (!TaskGroup.is(value)) {
throw illegalArgument('group');
}
this._group = value;
}
get options(): vscode.ShellOptions {
return this._options;
}