Merge branch 'master' into change-content-security-policy

Signed-off-by: Vitaliy Gulyy <vgulyy@redhat.com>
eclipse-theia · Jun 23, 2020 · b75a2f0 · b75a2f0
2 parents 6516b4a + 3090899
commit b75a2f0
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 14 deletions.
diff --git a/dev-packages/cli/src/download-plugins.ts b/dev-packages/cli/src/download-plugins.ts
@@ -65,6 +65,11 @@ export default async function downloadPlugins(options: DownloadPluginsOptions =
 
     await mkdirpAsPromised(pluginsDir);
 
+    if (!pck.theiaPlugins) {
+        console.log(red('error: missing mandatory \'theiaPlugins\' property.'));
+        return;
+    }
+
     await Promise.all(Object.keys(pck.theiaPlugins).map(async plugin => {
         if (!plugin) {
             return;

diff --git a/packages/output/src/browser/output-contribution.ts b/packages/output/src/browser/output-contribution.ts
@@ -122,19 +122,42 @@ export class OutputContribution extends AbstractViewContribution<OutputWidget> i
     registerCommands(registry: CommandRegistry): void {
         super.registerCommands(registry);
         registry.registerCommand(OutputCommands.CLEAR__WIDGET, {
-            isEnabled: widget => this.withWidget(widget),
-            isVisible: widget => this.withWidget(widget),
-            execute: () => this.widget.then(widget => widget.clear())
+            isEnabled: arg => {
+                if (arg instanceof Widget) {
+                    return arg instanceof OutputWidget;
+                }
+                return this.shell.currentWidget instanceof OutputWidget;
+            },
+            isVisible: arg => {
+                if (arg instanceof Widget) {
+                    return arg instanceof OutputWidget;
+                }
+                return this.shell.currentWidget instanceof OutputWidget;
+            },
+            execute: () => {
+                this.widget.then(widget => {
+                    this.withWidget(widget, output => {
+                        output.clear();
+                        return true;
+                    });
+                });
+            }
         });
         registry.registerCommand(OutputCommands.LOCK__WIDGET, {
             isEnabled: widget => this.withWidget(widget, output => !output.isLocked),
             isVisible: widget => this.withWidget(widget, output => !output.isLocked),
-            execute: () => this.widget.then(widget => widget.lock())
+            execute: widget => this.withWidget(widget, output => {
+                output.lock();
+                return true;
+            })
         });
         registry.registerCommand(OutputCommands.UNLOCK__WIDGET, {
             isEnabled: widget => this.withWidget(widget, output => output.isLocked),
             isVisible: widget => this.withWidget(widget, output => output.isLocked),
-            execute: () => this.widget.then(widget => widget.unlock())
+            execute: widget => this.withWidget(widget, output => {
+                output.unlock();
+                return true;
+            })
         });
     }
 
@@ -167,10 +190,9 @@ export class OutputContribution extends AbstractViewContribution<OutputWidget> i
     }
 
     protected withWidget(
-        widget: Widget | undefined,
+        widget: Widget | undefined = this.tryGetWidget(),
         predicate: (output: OutputWidget) => boolean = () => true
     ): boolean | false {
-
         return widget instanceof OutputWidget ? predicate(widget) : false;
     }
 

diff --git a/packages/output/src/browser/output-toolbar-contribution.tsx b/packages/output/src/browser/output-toolbar-contribution.tsx
@@ -60,7 +60,7 @@ export class OutputToolbarContribution implements TabBarToolbarContribution {
         toolbarRegistry.registerItem({
             id: OutputCommands.CLEAR__WIDGET.id,
             command: OutputCommands.CLEAR__WIDGET.id,
-            tooltip: OutputCommands.CLEAR__WIDGET.label,
+            tooltip: 'Clear Output',
             priority: 1,
         });
         toolbarRegistry.registerItem({

diff --git a/packages/task/src/common/task-protocol.ts b/packages/task/src/common/task-protocol.ts
@@ -28,15 +28,15 @@ export enum DependsOrder {
 }
 
 export enum RevealKind {
-    Always,
-    Silent,
-    Never
+    Always = 'always',
+    Silent = 'silent',
+    Never = 'never'
 }
 
 export enum PanelKind {
-    Shared,
-    Dedicated,
-    New
+    Shared = 'shared',
+    Dedicated = 'dedicated',
+    New = 'new'
 }
 
 export interface TaskOutputPresentation {