Fixes eclipse-theia#5110, fixes eclipse-theia#5223: re-implemented "o…

…pen source" to work with image/pdf files Signed-off-by: fangnx <[email protected]>
fangnx · May 29, 2019 · d38c03d · d38c03d
1 parent f39185a
commit d38c03d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/packages/core/src/browser/widget-open-handler.ts b/packages/core/src/browser/widget-open-handler.ts
@@ -36,6 +36,12 @@ export interface WidgetOpenerOptions extends OpenerOptions {
      * By default to the main area.
      */
     widgetOptions?: ApplicationShell.WidgetOptions;
+    /**
+     * Specify what the widget is opened for
+     * 'preview': image/pdf/etc. preview
+     * 'edit': source file
+     */
+    openFor?: 'preview' | 'edit';
 }
 
 @injectable()

diff --git a/packages/editor/src/browser/editor-manager.ts b/packages/editor/src/browser/editor-manager.ts
@@ -98,6 +98,10 @@ export class EditorManager extends NavigatableWidgetOpenHandler<EditorWidget> {
     }
 
     canHandle(uri: URI, options?: WidgetOpenerOptions): number {
+        // Set the priority negative if an open handler is called for 'preview' (not for 'edit)
+        if (options && options.openFor === 'preview') {
+            return -100;
+        }
         return 100;
     }
 

diff --git a/packages/mini-browser/src/browser/mini-browser-open-handler.ts b/packages/mini-browser/src/browser/mini-browser-open-handler.ts
@@ -97,11 +97,15 @@ export class MiniBrowserOpenHandler extends NavigatableWidgetOpenHandler<MiniBro
         }))();
     }
 
-    canHandle(uri: URI): number {
+    canHandle(uri: URI, options?: WidgetOpenerOptions): number {
         // It does not guard against directories. For instance, a folder with this name: `Hahahah.html`.
         // We could check with the FS, but then, this method would become async again.
         const extension = uri.toString().split('.').pop();
         if (extension) {
+            // Set the priority negative if an open handler is called for 'edit' (not for 'preview')
+            if (options && options.openFor === 'edit') {
+                return -100;
+            }
             return this.supportedExtensions.get(extension.toLocaleLowerCase()) || 0;
         }
         return 0;
@@ -237,7 +241,8 @@ export class MiniBrowserOpenHandler extends NavigatableWidgetOpenHandler<MiniBro
         const uri = this.getSourceUri(ref);
         if (uri) {
             await open(this.openerService, uri, {
-                widgetOptions: { ref, mode: 'open-to-left' }
+                widgetOptions: { ref, mode: 'open-to-left' },
+                openFor: 'edit'
             });
         }
     }
@@ -275,7 +280,8 @@ export class MiniBrowserOpenHandler extends NavigatableWidgetOpenHandler<MiniBro
                 area: 'right'
             },
             resetBackground,
-            iconClass: 'theia-mini-browser-icon'
+            iconClass: 'theia-mini-browser-icon',
+            openFor: 'preview'
         };
     }