提交 7ab323ee 编写于 作者: D Dirk Baeumer

Fixes #35048: Tasks: possible to run multiple of the same task -> broken terminal dropdown

上级 d789b004
......@@ -47,7 +47,7 @@ namespace Configuration {
properties?: IJSONSchemaMap;
}
export function from(value: TaskDefinition, messageCollector: ExtensionMessageCollector): Tasks.TaskDefinition {
export function from(value: TaskDefinition, extensionId: string, messageCollector: ExtensionMessageCollector): Tasks.TaskDefinition {
if (!value) {
return undefined;
}
......@@ -64,7 +64,7 @@ namespace Configuration {
}
}
}
return { taskType, required: required.length >= 0 ? required : undefined, properties: value.properties ? Objects.deepClone(value.properties) : undefined };
return { extensionId, taskType, required: required.length >= 0 ? required : undefined, properties: value.properties ? Objects.deepClone(value.properties) : undefined };
}
}
......@@ -93,15 +93,15 @@ class TaskDefinitionRegistryImpl implements ITaskDefinitionRegistry {
this.readyPromise = new TPromise<void>((resolve, reject) => {
taskDefinitionsExtPoint.setHandler((extensions) => {
try {
extensions.forEach(extension => {
for (let extension of extensions) {
let taskTypes = extension.value;
for (let taskType of taskTypes) {
let type = Configuration.from(taskType, extension.collector);
let type = Configuration.from(taskType, extension.description.id, extension.collector);
if (type) {
this.taskTypes[type.taskType] = type;
}
}
});
};
} catch (error) {
}
resolve(undefined);
......
......@@ -522,6 +522,7 @@ export interface TaskSet {
}
export interface TaskDefinition {
extensionId: string;
taskType: string;
required: string[];
properties: IJSONSchemaMap;
......
......@@ -1201,7 +1201,7 @@ namespace ConfiguringTask {
let result: Tasks.ConfiguringTask = {
type: type,
configures: taskIdentifier,
_id: taskIdentifier._key,
_id: `${typeDeclaration.extensionId}.${taskIdentifier._key}`,
_source: Objects.assign({}, source, { config: configElement }),
_label: undefined
};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册