Adopt Uri.joinPath

mjbvz · mjbvz · commit b5ba76062395 · 2020-06-09T16:08:42.000-07:00
For microsoft#99717
diff --git a/extensions/markdown-language-features/src/features/preview.ts b/extensions/markdown-language-features/src/features/preview.ts
@@ -227,10 +227,10 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 	}
 
 	private get iconPath() {
-		const root = path.join(this._contributionProvider.extensionPath, 'media');
+		const root = vscode.Uri.joinPath(this._contributionProvider.extensionUri, 'media');
 		return {
-			light: vscode.Uri.file(path.join(root, 'preview-light.svg')),
-			dark: vscode.Uri.file(path.join(root, 'preview-dark.svg'))
+			light: vscode.Uri.joinPath(root, 'preview-light.svg'),
+			dark: vscode.Uri.joinPath(root, 'preview-dark.svg'),
 		};
 	}
 
diff --git a/extensions/markdown-language-features/src/markdownExtensions.ts b/extensions/markdown-language-features/src/markdownExtensions.ts
@@ -113,7 +113,8 @@ export namespace MarkdownContributions {
 }
 
 export interface MarkdownContributionProvider {
-	readonly extensionPath: string;
+	readonly extensionUri: vscode.Uri;
+
 	readonly contributions: MarkdownContributions;
 	readonly onContributionsChanged: vscode.Event<this>;
 
@@ -124,7 +125,7 @@ class VSCodeExtensionMarkdownContributionProvider extends Disposable implements
 	private _contributions?: MarkdownContributions;
 
 	public constructor(
-		public readonly extensionPath: string,
+		private readonly _extensionContext: vscode.ExtensionContext,
 	) {
 		super();
 
@@ -138,6 +139,8 @@ class VSCodeExtensionMarkdownContributionProvider extends Disposable implements
 		}, undefined, this._disposables);
 	}
 
+	public get extensionUri() { return this._extensionContext.extensionUri; }
+
 	private readonly _onContributionsChanged = this._register(new vscode.EventEmitter<this>());
 	public readonly onContributionsChanged = this._onContributionsChanged.event;
 
@@ -156,5 +159,5 @@ class VSCodeExtensionMarkdownContributionProvider extends Disposable implements
 }
 
 export function getMarkdownExtensionContributions(context: vscode.ExtensionContext): MarkdownContributionProvider {
-	return new VSCodeExtensionMarkdownContributionProvider(context.extensionPath);
+	return new VSCodeExtensionMarkdownContributionProvider(context);
 }
diff --git a/extensions/markdown-language-features/src/test/engine.ts b/extensions/markdown-language-features/src/test/engine.ts
@@ -10,7 +10,7 @@ import { githubSlugifier } from '../slugify';
 import { Disposable } from '../util/dispose';
 
 const emptyContributions = new class extends Disposable implements MarkdownContributionProvider {
-	readonly extensionPath = '';
+	readonly extensionUri = vscode.Uri.file('/');
 	readonly contributions = MarkdownContributions.Empty;
 	readonly onContributionsChanged = this._register(new vscode.EventEmitter<this>()).event;
 };

Original file line number	Diff line number	Diff line change
`@@ -227,10 +227,10 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`private get iconPath() {`
`230`		`- const root = path.join(this._contributionProvider.extensionPath, 'media');`
	`230`	`+ const root = vscode.Uri.joinPath(this._contributionProvider.extensionUri, 'media');`
`231`	`231`	`return {`
`232`		`- light: vscode.Uri.file(path.join(root, 'preview-light.svg')),`
`233`		`- dark: vscode.Uri.file(path.join(root, 'preview-dark.svg'))`
	`232`	`+ light: vscode.Uri.joinPath(root, 'preview-light.svg'),`
	`233`	`+ dark: vscode.Uri.joinPath(root, 'preview-dark.svg'),`
`234`	`234`	`};`
`235`	`235`	`}`
`236`	`236`