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

Implemented latest feedback from #28235

Browse Source
This commit is contained in:
Dirk Baeumer
2017-06-21 23:44:32 +02:00
parent c9cf1f51b3
commit 2ef8e48de4
21 changed files with 1121 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@
import * as nls from 'vs/nls';
import { TPromise } from 'vs/base/common/winjs.base';
import * as UUID from 'vs/base/common/uuid';
import * as Objects from 'vs/base/common/objects';
import { asWinJsPromise } from 'vs/base/common/async';
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
@@ -315,7 +316,7 @@ namespace Tasks {
return result;
}
function fromSingle(task: vscode.Task, extension: IExtensionDescription, uuidMap: UUIDMap): TaskSystem.Task {
function fromSingle(task: vscode.Task, extension: IExtensionDescription, uuidMap: UUIDMap): TaskSystem.ContributedTask {
if (typeof task.name !== 'string') {
return undefined;
}
@@ -336,12 +337,20 @@ namespace Tasks {
detail: extension.id
};
let label = nls.localize('task.label', '{0}: {1}', source.label, task.name);
let result: TaskSystem.Task = {
_id: uuidMap.getUUID(task.identifier),
let id = `${extension.id}.${task.identifierKey}`;
let identifier: TaskSystem.TaskIdentifier = {
_key: task.identifierKey,
type: task.identifier.type
};
Objects.assign(identifier, task.identifier);
let result: TaskSystem.ContributedTask = {
_id: id, // uuidMap.getUUID(identifier),
_source: source,
_label: label,
type: task.identifier.type,
defines: identifier,
name: task.name,
identifier: task.identifier ? task.identifier : `${extension.id}.${task.name}`,
identifier: label,
group: types.TaskGroup.is(task.group) ? task.group : undefined,
command: command,
isBackground: !!task.isBackground,
@@ -357,7 +366,7 @@ namespace Tasks {
let result: TaskSystem.CommandConfiguration = {
name: value.process,
args: Strings.from(value.args),
type: TaskSystem.CommandType.Process,
runtime: TaskSystem.RuntimeType.Process,
suppressTaskName: true,
presentation: PresentationOptions.from(value.presentationOptions)
};
@@ -373,7 +382,7 @@ namespace Tasks {
}
let result: TaskSystem.CommandConfiguration = {
name: value.commandLine,
type: TaskSystem.CommandType.Shell,
runtime: TaskSystem.RuntimeType.Shell,
presentation: PresentationOptions.from(value.presentationOptions)
};
if (value.options) {

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

@@ -4,6 +4,8 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as crypto from 'crypto';
import URI from 'vs/base/common/uri';
import { illegalArgument } from 'vs/base/common/errors';
import * as vscode from 'vscode';
@@ -1049,40 +1051,53 @@ export class BaseTask {
private _name: string;
private _problemMatchers: string[];
private _identifier: string;
private _identifier: vscode.TaskIdentifier;
private _identifierKey: string;
private _isBackground: boolean;
private _source: string;
private _group: string;
private _presentationOptions: vscode.TaskPresentationOptions;
constructor(name: string, problemMatchers: string[]) {
if (typeof name !== 'string') {
throw illegalArgument('name');
}
this._name = name;
constructor(identifier: vscode.TaskIdentifier, name: string, problemMatchers: string[]) {
this.identifier = identifier;
this.name = name;
this._problemMatchers = problemMatchers || [];
this._isBackground = false;
this._presentationOptions = Object.create(null);
}
get identifier(): string {
get identifier(): vscode.TaskIdentifier {
return this._identifier;
}
set identifier(value: string) {
set identifier(value: vscode.TaskIdentifier) {
if (value === void 0 || value === null) {
this._identifier = undefined;
}
if (typeof value !== 'string' || value.length === 0) {
throw illegalArgument('identifier must be a string of length > 0');
throw illegalArgument('Identifier can\'t be undefined or null');
}
this._identifierKey = undefined;
this._identifier = value;
}
get identifierKey(): string {
if (!this._identifierKey) {
const hash = crypto.createHash('md5');
hash.update(JSON.stringify(this._identifier));
this._identifierKey = hash.digest('hex');
}
return this._identifierKey;
}
get name(): string {
return this._name;
}
set name(value: string) {
if (typeof value !== 'string') {
throw illegalArgument('name');
}
this._name = value;
}
get isBackground(): boolean {
return this._isBackground;
}
@@ -1194,9 +1209,9 @@ export class ProcessTask extends BaseTask {
private _args: string[];
private _options: vscode.ProcessTaskOptions;
constructor(name: string, process: string, args?: string[], problemMatchers?: string | string[]);
constructor(name: string, process: string, args: string[] | undefined, options: vscode.ProcessTaskOptions, problemMatchers?: string | string[]);
constructor(name: string, process: string, arg3?: string[], arg4?: vscode.ProcessTaskOptions | string | string[], arg5?: string | string[]) {
constructor(identifier: vscode.TaskIdentifier, name: string, process: string, args?: string[], problemMatchers?: string | string[]);
constructor(identifier: vscode.TaskIdentifier, name: string, process: string, args: string[] | undefined, options: vscode.ProcessTaskOptions, problemMatchers?: string | string[]);
constructor(identifier: vscode.TaskIdentifier, name: string, process: string, varg1?: string[], varg2?: vscode.ProcessTaskOptions | string | string[], varg3?: string | string[]) {
if (typeof process !== 'string') {
throw illegalArgument('process');
}
@@ -1204,16 +1219,16 @@ export class ProcessTask extends BaseTask {
let options: vscode.ProcessTaskOptions;
let problemMatchers: string | string[];
args = arg3 || [];
if (arg4) {
if (Array.isArray(arg4) || typeof arg4 === 'string') {
problemMatchers = arg4;
args = varg1 || [];
if (varg2) {
if (Array.isArray(varg2) || typeof varg2 === 'string') {
problemMatchers = varg2;
} else {
options = arg4;
options = varg2;
}
}
if (arg5 && !problemMatchers) {
problemMatchers = arg5;
if (varg3 && !problemMatchers) {
problemMatchers = varg3;
}
let pm: string[];
if (problemMatchers && (typeof problemMatchers === 'string')) {
@@ -1222,7 +1237,7 @@ export class ProcessTask extends BaseTask {
pm = problemMatchers;
}
pm = pm || [];
super(name, pm);
super(identifier, name, pm);
this._process = process;
this._args = args;
this._options = options || Object.create(null);
@@ -1260,9 +1275,9 @@ export class ShellTask extends BaseTask implements vscode.ShellTask {
private _commandLine: string;
private _options: vscode.ShellTaskOptions;
constructor(name: string, commandLine: string, problemMatchers?: string | string[]);
constructor(name: string, commandLine: string, options: vscode.ShellTaskOptions, problemMatchers?: string | string[]);
constructor(name: string, commandLine: string, optionsOrProblemMatchers?: vscode.ShellTaskOptions | string | string[], problemMatchers?: string | string[]) {
constructor(identifier: vscode.TaskIdentifier, name: string, commandLine: string, problemMatchers?: string | string[]);
constructor(identifier: vscode.TaskIdentifier, name: string, commandLine: string, options: vscode.ShellTaskOptions, problemMatchers?: string | string[]);
constructor(identifier: vscode.TaskIdentifier, name: string, commandLine: string, optionsOrProblemMatchers?: vscode.ShellTaskOptions | string | string[], problemMatchers?: string | string[]) {
if (typeof commandLine !== 'string') {
throw illegalArgument('commandLine');
}
@@ -1279,7 +1294,7 @@ export class ShellTask extends BaseTask implements vscode.ShellTask {
pm = problemMatchers;
}
pm = pm || [];
super(name, pm);
super(identifier, name, pm);
this._commandLine = commandLine;
this._options = options || Object.create(null);
}