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

Fixes #29427 & #29617

Browse Source
This commit is contained in:
Dirk Baeumer
2017-06-27 21:38:56 +02:00
parent 14d457eeec
commit 19f310a027
17 changed files with 74 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,8 +333,8 @@ namespace Tasks {
detail: extension.id
};
let label = nls.localize('task.label', '{0}: {1}', source.label, task.name);
let key = (task as types.Task).kindKey;
let kind = (task as types.Task).kind;
let key = (task as types.Task).definitionKey;
let kind = (task as types.Task).definition;
let id = `${extension.id}.${key}`;
let taskKind: TaskSystem.TaskIdentifier = {
_key: key,

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

@@ -1153,8 +1153,8 @@ export class ShellExecution implements vscode.ShellExecution {
export class Task implements vscode.Task {
private _kind: vscode.TaskKind;
private _kindKey: string;
private _definition: vscode.TaskDefinition;
private _definitionKey: string;
private _name: string;
private _execution: ProcessExecution | ShellExecution;
private _problemMatchers: string[];
@@ -1163,13 +1163,8 @@ export class Task implements vscode.Task {
private _group: TaskGroup;
private _presentationOptions: vscode.TaskPresentationOptions;
constructor(kind: vscode.TaskKind, name: string, source: string);
constructor(kind: vscode.TaskKind, name: string, source: string, execution: ProcessExecution | ShellExecution);
constructor(kind: vscode.TaskKind, name: string, source: string, execution: ProcessExecution | ShellExecution, problemMatchers?: string | string[]);
constructor(kind: vscode.TaskKind, name: string, source: string, execution?: ProcessExecution | ShellExecution, problemMatchers?: string | string[]) {
this.kind = kind;
constructor(definition: vscode.TaskDefinition, name: string, source: string, execution?: ProcessExecution | ShellExecution, problemMatchers?: string | string[]) {
this.definition = definition;
this.name = name;
this.source = source;
this.execution = execution;
@@ -1183,25 +1178,25 @@ export class Task implements vscode.Task {
this._isBackground = false;
}
get kind(): vscode.TaskKind {
return this._kind;
get definition(): vscode.TaskDefinition {
return this._definition;
}
set kind(value: vscode.TaskKind) {
set definition(value: vscode.TaskDefinition) {
if (value === void 0 || value === null) {
throw illegalArgument('Kind can\'t be undefined or null');
}
this._kindKey = undefined;
this._kind = value;
this._definitionKey = undefined;
this._definition = value;
}
get kindKey(): string {
if (!this._kindKey) {
get definitionKey(): string {
if (!this._definitionKey) {
const hash = crypto.createHash('md5');
hash.update(JSON.stringify(this._kind));
this._kindKey = hash.digest('hex');
hash.update(JSON.stringify(this._definition));
this._definitionKey = hash.digest('hex');
}
return this._kindKey;
return this._definitionKey;
}
get name(): string {