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 27, 2019 · 56caaec · 56caaec
1 parent f39185a
commit 56caaec
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
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 higher than image/pdf/etc. preview handlers if the editor is used to 'open source'
+        if (options && options.openFor === 'edit') {
+            return 110;
+        }
         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
@@ -237,7 +237,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'
             });
         }
     }