Fix #4054 Elegant custom editor group logic

James-Yu · Nov 4, 2023 · f8e8687 · f8e8687
1 parent 197f94e
commit f8e8687
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/src/components/viewer.ts b/src/components/viewer.ts
@@ -170,8 +170,25 @@ export class Viewer {
             viewColumn: vscode.ViewColumn.Active,
             preserveFocus: true
         }
-        await vscode.commands.executeCommand('vscode.openWith', pdfUri, 'latex-workshop-pdf-hook', showOptions)
-        await moveActiveEditor(editorGroup, true)
+        if (editorGroup === 'left') {
+            const currentColumn = vscode.window.activeTextEditor?.viewColumn
+            if (currentColumn && currentColumn > 1) {
+                showOptions.viewColumn = currentColumn - 1
+                await vscode.commands.executeCommand('vscode.openWith', pdfUri, 'latex-workshop-pdf-hook', showOptions)
+            } else {
+                await vscode.commands.executeCommand('vscode.openWith', pdfUri, 'latex-workshop-pdf-hook', showOptions)
+                if (currentColumn === vscode.ViewColumn.One) {
+                    await moveActiveEditor('left', true)
+                }
+            }
+        } else if (editorGroup === 'right') {
+            const currentColumn = vscode.window.activeTextEditor?.viewColumn
+            showOptions.viewColumn = (currentColumn ?? 0) + 1
+            await vscode.commands.executeCommand('vscode.openWith', pdfUri, 'latex-workshop-pdf-hook', showOptions)
+        } else {
+            await vscode.commands.executeCommand('vscode.openWith', pdfUri, 'latex-workshop-pdf-hook', showOptions)
+            await moveActiveEditor(editorGroup, true)
+        }
         logger.log(`Open PDF tab for ${pdfUri.toString(true)}`)
     }