Fix latex-workshop.tab viewer mode target

James-Yu · Jul 9, 2023 · f8c7c3a · f8c7c3a
1 parent 48fb330
commit f8c7c3a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/commander.ts b/src/commander.ts
@@ -4,7 +4,6 @@ import * as lw from './lw'
 import { getSurroundingCommandRange, stripText } from './utils/utils'
 import { getLogger } from './components/logger'
 import { parser } from './components/parser'
-import { ViewerMode } from './components/viewer'
 
 const logger = getLogger('Commander')
 
@@ -80,7 +79,7 @@ export function recipes(recipe?: string) {
     })
 }
 
-export async function view(mode?: ViewerMode | vscode.Uri) {
+export async function view(mode?: 'tab' | 'browser' | 'external' | vscode.Uri) {
     if (mode) {
         logger.log(`VIEW command invoked with mode: ${mode}.`)
     } else {

diff --git a/src/components/viewer.ts b/src/components/viewer.ts
@@ -96,17 +96,20 @@ export class Viewer {
         return (await lw.server.getViewerUrl(pdfUri)).url
     }
 
-    async open(pdfFile: string, mode?: ViewerMode): Promise<void> {
+    async open(pdfFile: string, mode?: 'tab' | 'browser' | 'external'): Promise<void> {
         const configuration = vscode.workspace.getConfiguration('latex-workshop')
         const tabEditorGroup = configuration.get('view.pdf.tab.editorGroup') as string
-        mode = mode ?? configuration.get<ViewerMode>('view.pdf.viewer', 'tab')
-        if (mode === 'browser') {
+        let viewerMode: ViewerMode = mode ?? configuration.get<ViewerMode>('view.pdf.viewer', 'tab')
+        if (mode === 'tab' && configuration.get<ViewerMode>('view.pdf.viewer', 'tab') === 'customEditor') {
+            viewerMode = 'customEditor'
+        }
+        if (viewerMode === 'browser') {
             return lw.viewer.openBrowser(pdfFile)
-        } else if (mode === 'customEditor') {
+        } else if (viewerMode === 'customEditor') {
             return lw.viewer.openCustomEditor(pdfFile)
-        } else if (mode === 'tab' || mode === 'singleton') {
+        } else if (viewerMode === 'tab' || viewerMode === 'singleton') {
             return lw.viewer.openTab(pdfFile, tabEditorGroup, true)
-        } else if (mode === 'external') {
+        } else if (viewerMode === 'external') {
             return lw.viewer.openExternal(pdfFile)
         }
     }