Merge from vscode 7eaf220cafb9d9e901370ffce02229171cbf3ea6

This commit is contained in:
ADS Merger
2020-09-03 02:34:56 +00:00
committed by Anthony Dresser
parent 39d9eed585
commit a63578e6f7
519 changed files with 14338 additions and 6670 deletions

View File

@@ -3059,7 +3059,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
if (selectedTask) {
selectedEntry = {
label: nls.localize('TaskService.defaultBuildTaskExists', '{0} is already marked as the default build task', selectedTask.getQualifiedLabel()),
task: selectedTask
task: selectedTask,
detail: this.showDetail() ? selectedTask.configurationProperties.detail : undefined
};
}
this.showIgnoredFoldersMessage().then(() => {
@@ -3110,7 +3111,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
if (selectedTask) {
selectedEntry = {
label: nls.localize('TaskService.defaultTestTaskExists', '{0} is already marked as the default test task.', selectedTask.getQualifiedLabel()),
task: selectedTask
task: selectedTask,
detail: this.showDetail() ? selectedTask.configurationProperties.detail : undefined
};
}