From 395d34d64cde19e49b3d836d0b2f251b2fd7391f Mon Sep 17 00:00:00 2001
From: James-Yu <jqyu@eee.hku.hk>
Date: Tue, 24 Jul 2018 11:30:20 +0800
Subject: [PATCH] Resolve #717

---
 package.json     | 13 +------------
 src/commander.ts |  2 +-
 src/main.ts      |  7 ++++++-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index d6f3ec13d..e55ae86c6 100644
--- a/package.json
+++ b/package.json
@@ -29,11 +29,11 @@
     "onLanguage:tex",
     "onLanguage:latex",
     "onLanguage:doctex",
+    "onLanguage:pdf",
     "onCommand:latex-workshop.build",
     "onCommand:latex-workshop.recipes",
     "onCommand:latex-workshop.view",
     "onCommand:latex-workshop.tab",
-    "onCommand:latex-workshop.pdf",
     "onCommand:latex-workshop.synctex",
     "onCommand:latex-workshop.clean",
     "onCommand:latex-workshop.citation",
@@ -202,10 +202,6 @@
         "title": "Kill LaTeX compiler process",
         "category": "LaTeX Workshop"
       },
-      {
-        "command": "latex-workshop.pdf",
-        "title": "View an arbitrary PDF file"
-      },
       {
         "command": "latex-workshop.synctex",
         "title": "SyncTeX from cursor",
@@ -587,13 +583,6 @@
       }
     },
     "menus": {
-      "explorer/context": [
-        {
-          "when": "resourceLangId == pdf",
-          "command": "latex-workshop.pdf",
-          "group": "navigation"
-        }
-      ],
       "editor/context": [
         {
           "when": "resourceLangId == latex",
diff --git a/src/commander.ts b/src/commander.ts
index d1c405d37..821075c04 100644
--- a/src/commander.ts
+++ b/src/commander.ts
@@ -263,7 +263,7 @@ export class Commander {
         if (!this.commandTitles) {
             const commands = this.extension.packageInfo.contributes.commands.filter(command => {
                 return ['latex-workshop.actions', 'latex-workshop.build', 'latex-workshop.recipes',
-                        'latex-workshop.view', 'latex-workshop.pdf', 'latex-workshop.compilerlog',
+                        'latex-workshop.view', 'latex-workshop.compilerlog',
                         'latex-workshop.log', 'latex-workshop.tab'].indexOf(command.command) < 0
             })
             this.commandTitles = commands.map(command => command.title)
diff --git a/src/main.ts b/src/main.ts
index ee8de3adb..b773989c8 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -132,7 +132,6 @@ export async function activate(context: vscode.ExtensionContext) {
     vscode.commands.registerCommand('latex-workshop.view', () => extension.commander.view())
     vscode.commands.registerCommand('latex-workshop.tab', () => extension.commander.tab())
     vscode.commands.registerCommand('latex-workshop.kill', () => extension.commander.kill())
-    vscode.commands.registerCommand('latex-workshop.pdf', (uri: vscode.Uri | undefined) => extension.commander.pdf(uri))
     vscode.commands.registerCommand('latex-workshop.synctex', () => extension.commander.synctex())
     vscode.commands.registerCommand('latex-workshop.clean', () => extension.commander.clean())
     vscode.commands.registerCommand('latex-workshop.actions', () => extension.commander.actions())
@@ -180,6 +179,12 @@ export async function activate(context: vscode.ExtensionContext) {
             obsoleteConfigCheck()
             extension.manager.findRoot()
         }
+        // console.log(e.languageId, e.uri.scheme)
+        if (e.languageId === 'pdf' && e.uri.scheme !== 'latex-workshop-pdf') {
+            vscode.commands.executeCommand('workbench.action.closeActiveEditor').then(() => {
+                extension.commander.pdf(e.uri)
+            })
+        }
     }))
 
     context.subscriptions.push(vscode.workspace.onDidChangeTextDocument((e: vscode.TextDocumentChangeEvent) => {