new Uri.joinPath

jan-dolejsi · jan-dolejsi · commit c3ef34718bdc · 2021-03-14T23:53:42.000+01:00
diff --git a/src/webviewUtils.ts b/src/webviewUtils.ts
@@ -64,7 +64,7 @@ export interface WebViewHtmlOptions {
 }
 
 function getWebviewUri(extensionContext: ExtensionContext, relativePath: string, fileName: string, webview?: Webview): Uri {
-    return asWebviewUri(Uri.file(extensionContext.asAbsolutePath(path.join(relativePath, fileName))), webview);
+    return asWebviewUri(Uri.joinPath(extensionContext.extensionUri, relativePath, fileName), webview);
 }
 
 function getAbsoluteWebviewUri(extensionContext: ExtensionContext, webview: Webview, options: WebViewHtmlOptions, uri: Uri): Uri {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export interface WebViewHtmlOptions {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`function getWebviewUri(extensionContext: ExtensionContext, relativePath: string, fileName: string, webview?: Webview): Uri {`
`67`		`- return asWebviewUri(Uri.file(extensionContext.asAbsolutePath(path.join(relativePath, fileName))), webview);`
	`67`	`+ return asWebviewUri(Uri.joinPath(extensionContext.extensionUri, relativePath, fileName), webview);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`function getAbsoluteWebviewUri(extensionContext: ExtensionContext, webview: Webview, options: WebViewHtmlOptions, uri: Uri): Uri {`