align how tasks are displayed as quick open items

- In a multi root workspace, detected tasks are displayed in different ways across `Run task`, `Restart running task`, `Terminate task`, and `Show running tasks`. This change aligns the display of the task quick open items. - fixed #6821 Signed-off-by: Liang Huang <lhuang4@ualberta.ca>
eclipse-theia · Mar 22, 2020 · 789245b · 789245b
1 parent ae5591e
commit 789245b
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,9 +7,10 @@
 
 Breaking changes:
 
-- [scm][git] the History view (GitHistoryWidget) has moved from the git package to a new   package, scm-extra, and
+- [scm][git] the History view (GitHistoryWidget) has moved from the git package to a new package, scm-extra, and
   renamed to ScmHistoryWidget.  GitNavigableListWidget has also moved.
   CSS classes have been moved renamed accordingly.  [6381](https://github.com/eclipse-theia/theia/pull/6381)
+- [task] `TaskRestartRunningQuickOpenItem` class is renamed into `RunningTaskQuickOpenItem`.
 
 ## v0.16.0
 

diff --git a/packages/task/src/browser/quick-open-task.ts b/packages/task/src/browser/quick-open-task.ts
@@ -619,32 +619,56 @@ export class TaskConfigureQuickOpenItem extends QuickOpenGroupItem {
 @injectable()
 export class TaskTerminateQuickOpen implements QuickOpenModel {
 
+    @inject(LabelProvider)
+    protected readonly labelProvider: LabelProvider;
+
     @inject(QuickOpenService)
     protected readonly quickOpenService: QuickOpenService;
 
+    @inject(TaskDefinitionRegistry)
+    protected readonly taskDefinitionRegistry: TaskDefinitionRegistry;
+
+    @inject(TaskNameResolver)
+    protected readonly taskNameResolver: TaskNameResolver;
+
+    @inject(TaskSourceResolver)
+    protected readonly taskSourceResolver: TaskSourceResolver;
+
     @inject(TaskService)
     protected readonly taskService: TaskService;
 
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
     async onType(_lookFor: string, acceptor: (items: QuickOpenItem[]) => void): Promise<void> {
         const items: QuickOpenItem[] = [];
         const runningTasks: TaskInfo[] = await this.taskService.getRunningTasks();
+        const isMulti: boolean = this.workspaceService.isMultiRootWorkspaceOpened;
         if (runningTasks.length <= 0) {
             items.push(new QuickOpenItem({
                 label: 'No task is currently running',
                 run: (): boolean => false,
             }));
         } else {
             runningTasks.forEach((task: TaskInfo) => {
-                items.push(new QuickOpenItem({
-                    label: task.config.label,
-                    run: (mode: QuickOpenMode): boolean => {
-                        if (mode !== QuickOpenMode.OPEN) {
-                            return false;
+                items.push(new RunningTaskQuickOpenItem(
+                    task,
+                    this.taskService,
+                    this.taskNameResolver,
+                    this.taskSourceResolver,
+                    this.taskDefinitionRegistry,
+                    this.labelProvider,
+                    isMulti,
+                    {
+                        run: (mode: QuickOpenMode): boolean => {
+                            if (mode !== QuickOpenMode.OPEN) {
+                                return false;
+                            }
+                            this.taskService.kill(task.taskId);
+                            return true;
                         }
-                        this.taskService.kill(task.taskId);
-                        return true;
-                    }
-                }));
+                    },
+                ));
             });
             if (runningTasks.length > 1) {
                 items.push(new QuickOpenItem({
@@ -677,40 +701,64 @@ export class TaskTerminateQuickOpen implements QuickOpenModel {
 @injectable()
 export class TaskRunningQuickOpen implements QuickOpenModel {
 
+    @inject(LabelProvider)
+    protected readonly labelProvider: LabelProvider;
+
     @inject(QuickOpenService)
     protected readonly quickOpenService: QuickOpenService;
 
+    @inject(TaskDefinitionRegistry)
+    protected readonly taskDefinitionRegistry: TaskDefinitionRegistry;
+
+    @inject(TaskNameResolver)
+    protected readonly taskNameResolver: TaskNameResolver;
+
+    @inject(TaskSourceResolver)
+    protected readonly taskSourceResolver: TaskSourceResolver;
+
     @inject(TaskService)
     protected readonly taskService: TaskService;
 
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
     @inject(TerminalService)
     protected readonly terminalService: TerminalService;
 
     async onType(_lookFor: string, acceptor: (items: QuickOpenItem[]) => void): Promise<void> {
         const items: QuickOpenItem[] = [];
         const runningTasks: TaskInfo[] = await this.taskService.getRunningTasks();
+        const isMulti: boolean = this.workspaceService.isMultiRootWorkspaceOpened;
         if (runningTasks.length <= 0) {
             items.push(new QuickOpenItem({
                 label: 'No task is currently running',
                 run: (): boolean => false,
             }));
         } else {
             runningTasks.forEach((task: TaskInfo) => {
-                items.push(new QuickOpenItem({
-                    label: task.config.label,
-                    run: (mode: QuickOpenMode): boolean => {
-                        if (mode !== QuickOpenMode.OPEN) {
-                            return false;
-                        }
-                        if (task.terminalId) {
-                            const terminal = this.terminalService.getById('terminal-' + task.terminalId);
-                            if (terminal) {
-                                this.terminalService.open(terminal);
+                items.push(new RunningTaskQuickOpenItem(
+                    task,
+                    this.taskService,
+                    this.taskNameResolver,
+                    this.taskSourceResolver,
+                    this.taskDefinitionRegistry,
+                    this.labelProvider,
+                    isMulti,
+                    {
+                        run: (mode: QuickOpenMode): boolean => {
+                            if (mode !== QuickOpenMode.OPEN) {
+                                return false;
                             }
+                            if (task.terminalId) {
+                                const terminal = this.terminalService.getById('terminal-' + task.terminalId);
+                                if (terminal) {
+                                    this.terminalService.open(terminal);
+                                }
+                            }
+                            return true;
                         }
-                        return true;
-                    }
-                }));
+                    },
+                ));
             });
         }
         acceptor(items);
@@ -725,7 +773,7 @@ export class TaskRunningQuickOpen implements QuickOpenModel {
     }
 }
 
-export class TaskRestartRunningQuickOpenItem extends QuickOpenItem {
+export class RunningTaskQuickOpenItem extends QuickOpenItem {
 
     constructor(
         protected readonly taskInfo: TaskInfo,
@@ -753,11 +801,10 @@ export class TaskRestartRunningQuickOpenItem extends QuickOpenItem {
     }
 
     run(mode: QuickOpenMode): boolean {
-        if (mode !== QuickOpenMode.OPEN) {
+        if (mode !== QuickOpenMode.OPEN || !this.options.run) {
             return false;
         }
-        this.taskService.restartTask(this.taskInfo);
-        return true;
+        return this.options.run(mode);
     }
 }
 
@@ -796,15 +843,23 @@ export class TaskRestartRunningQuickOpen implements QuickOpenModel {
             }));
         } else {
             runningTasks.forEach((task: TaskInfo) => {
-                items.push(new TaskRestartRunningQuickOpenItem(
+                items.push(new RunningTaskQuickOpenItem(
                     task,
                     this.taskService,
                     this.taskNameResolver,
                     this.taskSourceResolver,
                     this.taskDefinitionRegistry,
                     this.labelProvider,
                     isMulti,
-                    {},
+                    {
+                        run: (mode: QuickOpenMode): boolean => {
+                            if (mode !== QuickOpenMode.OPEN) {
+                                return false;
+                            }
+                            this.taskService.restartTask(task);
+                            return true;
+                        }
+                    },
                 ));
             });
         }