Proper new customEditor viewer mode

James-Yu · Jul 9, 2023 · 8c3df83 · 8c3df83
1 parent 97d5003
commit 8c3df83
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/commander.ts b/src/commander.ts
@@ -80,7 +80,7 @@ export function recipes(recipe?: string) {
     })
 }
 
-export async function view(mode?: ViewerMode | 'internal' | vscode.Uri) {
+export async function view(mode?: ViewerMode) {
     if (mode) {
         logger.log(`VIEW command invoked with mode: ${mode}.`)
     } else {

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

diff --git a/src/main.ts b/src/main.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import * as lw from './lw'
-import { pdfViewerHookProvider, pdfViewerPanelSerializer } from './components/viewer'
+import { type ViewerMode, pdfViewerHookProvider, pdfViewerPanelSerializer } from './components/viewer'
 import { MathPreviewPanelSerializer } from './components/mathpreviewpanel'
 import { BibtexCompleter } from './providers/bibtexcompletion'
 import { HoverProvider } from './providers/hover'
@@ -119,9 +119,9 @@ function registerLatexWorkshopCommands() {
         vscode.commands.registerCommand('latex-workshop.saveWithoutBuilding', () => lw.commander.saveActive()),
         vscode.commands.registerCommand('latex-workshop.build', () => lw.commander.build()),
         vscode.commands.registerCommand('latex-workshop.recipes', (recipe: string | undefined) => lw.commander.recipes(recipe)),
-        vscode.commands.registerCommand('latex-workshop.view', (mode: 'tab' | 'browser' | 'external' | vscode.Uri | undefined) => lw.commander.view(mode)),
+        vscode.commands.registerCommand('latex-workshop.view', (mode?: ViewerMode) => lw.commander.view(mode)),
         vscode.commands.registerCommand('latex-workshop.refresh-viewer', () => lw.commander.refresh()),
-        vscode.commands.registerCommand('latex-workshop.tab', () => lw.commander.view('internal')),
+        vscode.commands.registerCommand('latex-workshop.tab', () => lw.commander.view('tab')),
         vscode.commands.registerCommand('latex-workshop.viewInBrowser', () => lw.commander.view('browser')),
         vscode.commands.registerCommand('latex-workshop.viewExternal', () => lw.commander.view('external')),
         vscode.commands.registerCommand('latex-workshop.kill', () => lw.commander.kill()),