ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-09 17:52:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode ad407028575a77ea387eb7cc219b323dc017b686

Browse Source
This commit is contained in:
ADS Merger
2020-08-22 06:06:52 +00:00
committed by Anthony Dresser
parent 404260b8a0
commit 4ad73d381c
480 changed files with 14360 additions and 14122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
View File

@@ -1528,7 +1528,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
if (this._taskSystem?.isTaskVisible(executeResult.task)) {
const message = nls.localize('TaskSystem.activeSame.noBackground', 'The task \'{0}\' is already active.', executeResult.task.getQualifiedLabel());
let lastInstance = this.getTaskSystem().getLastInstance(executeResult.task) ?? executeResult.task;
this.notificationService.prompt(Severity.Info, message,
this.notificationService.prompt(Severity.Warning, message,
[{
label: nls.localize('terminateTask', "Terminate Task"),
run: () => this.terminate(lastInstance)
@@ -2606,7 +2606,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
}
if (buildTasks.length === 1) {
this.tryResolveTask(buildTasks[0]).then(resolvedTask => {
this.run(resolvedTask).then(undefined, reason => {
this.run(resolvedTask, undefined, TaskRunSource.User).then(undefined, reason => {
// eat the error, it has already been surfaced to the user and we don't care about it here
});
});
@@ -2617,7 +2617,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
if (tasks.length > 0) {
let { defaults, users } = this.splitPerGroupType(tasks);
if (defaults.length === 1) {
this.run(defaults[0]).then(undefined, reason => {
this.run(defaults[0], undefined, TaskRunSource.User).then(undefined, reason => {
// eat the error, it has already been surfaced to the user and we don't care about it here
});
return;
@@ -2641,7 +2641,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
this.runConfigureDefaultBuildTask();
return;
}
this.run(task, { attachProblemMatcher: true }).then(undefined, reason => {
this.run(task, { attachProblemMatcher: true }, TaskRunSource.User).then(undefined, reason => {
// eat the error, it has already been surfaced to the user and we don't care about it here
});
});
@@ -2667,7 +2667,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
if (tasks.length > 0) {
let { defaults, users } = this.splitPerGroupType(tasks);
if (defaults.length === 1) {
this.run(defaults[0]).then(undefined, reason => {
this.run(defaults[0], undefined, TaskRunSource.User).then(undefined, reason => {
// eat the error, it has already been surfaced to the user and we don't care about it here
});
return;
@@ -2691,7 +2691,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
this.runConfigureTasks();
return;
}
this.run(task).then(undefined, reason => {
this.run(task, undefined, TaskRunSource.User).then(undefined, reason => {
// eat the error, it has already been surfaced to the user and we don't care about it here
});
});
@@ -2963,7 +2963,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
if (tasks.length > 0) {
tasks = tasks.sort((a, b) => a._label.localeCompare(b._label));
for (let task of tasks) {
entries.push({ label: task._label, task, description: this.getTaskDescription(task) });
entries.push({ label: task._label, task, description: this.getTaskDescription(task), detail: this.showDetail() ? task.configurationProperties.detail : undefined });
if (!ContributedTask.is(task)) {
needsCreateOrOpen = false;
}