Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 04:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adopt Uri.joinPath

Browse Source 
For #99717
This commit is contained in:
Matt Bierner
2020-06-09 16:08:42 -07:00
parent a51205f59d
commit b5ba760623
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/markdown-language-features/src/features/preview.ts
View File

@@ -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'),
};
}

9
extensions/markdown-language-features/src/markdownExtensions.ts
View File

@@ -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);
}

2
extensions/markdown-language-features/src/test/engine.ts
View File

@@ -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;
};