Merge pull request James-Yu#1783 from tamuratak/not_use_uri

we do not have to use Uri.file for paths of pdf files
werunom · Nov 4, 2019 · 4fcf601 · 4fcf601
2 parents e01e5e8 + 26e8198
commit 4fcf601
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/components/viewer.ts b/src/components/viewer.ts
@@ -106,23 +106,22 @@ export class Viewer {
         const pdfFile = this.extension.manager.tex2pdf(sourceFile, respectOutDir)
         this.clients[pdfFile.toLocaleUpperCase()] = this.clients[pdfFile.toLocaleUpperCase()] || []
 
-        const uri = vscode.Uri.file(pdfFile).with({scheme: 'latex-workshop-pdf'})
         const editor = vscode.window.activeTextEditor
         const panel = vscode.window.createWebviewPanel('latex-workshop-pdf', path.basename(pdfFile), sideColumn ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active, {
             enableScripts: true,
             retainContextWhenHidden: true,
             portMapping : [{webviewPort: this.extension.server.port, extensionHostPort: this.extension.server.port}]
         })
-        panel.webview.html = this.getPDFViewerContent(uri)
+        panel.webview.html = this.getPDFViewerContent(pdfFile)
         if (editor && sideColumn) {
             setTimeout(() => { vscode.window.showTextDocument(editor.document, editor.viewColumn) }, 500)
         }
         this.extension.logger.addLogMessage(`Open PDF tab for ${pdfFile}`)
     }
 
-    getPDFViewerContent(uri: vscode.Uri): string {
+    getPDFViewerContent(pdfFile: string): string {
         // viewer/viewer.js automatically requests the file to server.ts and server.ts decodes the encoded fsPath.
-        const url = `http://localhost:${this.extension.server.port}/viewer.html?incode=1&file=${encodePathWithPrefix(uri.fsPath)}`
+        const url = `http://localhost:${this.extension.server.port}/viewer.html?incode=1&file=${encodePathWithPrefix(pdfFile)}`
         return `
             <!DOCTYPE html><html><head><meta http-equiv="Content-Security-Policy" content="default-src http://localhost:* http://127.0.0.1:*; script-src 'unsafe-inline'; style-src 'unsafe-inline';"></head>
             <body><iframe id="preview-panel" class="preview-panel" src="${url}" style="position:absolute; border: none; left: 0; top: 0; width: 100%; height: 100%;">

diff --git a/src/utils/utils.ts b/src/utils/utils.ts
@@ -105,8 +105,8 @@ export function decodePath(b64url: string) {
     return decodeURIComponent(s)
 }
 
-export function encodePathWithPrefix(url: string) {
-    return pdfFilePrefix + encodePath(url)
+export function encodePathWithPrefix(pdfFilePath: string) {
+    return pdfFilePrefix + encodePath(pdfFilePath)
 }
 
 export function decodePathWithPrefix(b64urlWithPrefix: string) {