Markdown path completions tests use mocked out fs

extensions/markdown-language-features/src/extension.ts

@@ -51,7 +51,7 @@ export function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(workspace, parser, tocProvider);
 
 	const contentProvider = new MdDocumentRenderer(engine, context, cspArbiter, contributions, logger);
-	const previewManager = new MarkdownPreviewManager(contentProvider, logger, contributions, tocProvider);
+	const previewManager = new MarkdownPreviewManager(contentProvider, workspace, logger, contributions, tocProvider);
 	context.subscriptions.push(previewManager);
 
 	context.subscriptions.push(registerMarkdownLanguageFeatures(parser, workspace, commandManager, tocProvider, logger));
@@ -88,7 +88,7 @@ function registerMarkdownLanguageFeatures(
 		registerFindFileReferenceSupport(commandManager, referencesProvider),
 		registerFoldingSupport(selector, parser, tocProvider),
 		registerPasteSupport(selector),
-		registerPathCompletionSupport(selector, parser, linkProvider),
+		registerPathCompletionSupport(selector, workspace, parser, linkProvider),
 		registerReferencesSupport(selector, referencesProvider),
 		registerRenameSupport(selector, workspace, referencesProvider, parser.slugifier),
 		registerSmartSelectSupport(selector, parser, tocProvider),

extensions/markdown-language-features/src/languageFeatures/pathCompletions.ts

@@ -9,6 +9,8 @@ import { IMdParser } from '../markdownEngine';
 import { TableOfContents } from '../tableOfContents';
 import { ITextDocument } from '../types/textDocument';
 import { resolveUriToMarkdownFile } from '../util/openDocumentLink';
+import { Schemes } from '../util/schemes';
+import { IMdWorkspace } from '../workspace';
 import { MdLinkProvider } from './documentLinks';
 
 enum CompletionContextKind {
@@ -87,6 +89,7 @@ function tryDecodeUriComponent(str: string): string {
 export class MdVsCodePathCompletionProvider implements vscode.CompletionItemProvider {
 
 	constructor(
+		private readonly workspace: IMdWorkspace,
 		private readonly parser: IMdParser,
 		private readonly linkProvider: MdLinkProvider,
 	) { }
@@ -128,7 +131,7 @@ export class MdVsCodePathCompletionProvider implements vscode.CompletionItemProv
 					if (context.anchorInfo) { // Anchor to a different document
 						const rawUri = this.resolveReference(document, context.anchorInfo.beforeAnchor);
 						if (rawUri) {
-							const otherDoc = await resolveUriToMarkdownFile(rawUri);
+							const otherDoc = await resolveUriToMarkdownFile(this.workspace, rawUri);
 							if (otherDoc) {
 								const anchorStartPosition = position.translate({ characterDelta: -(context.anchorInfo.anchorPrefix.length + 1) });
 								const range = new vscode.Range(anchorStartPosition, position);
@@ -284,13 +287,7 @@ export class MdVsCodePathCompletionProvider implements vscode.CompletionItemProv
 		const pathSegmentEnd = position.translate({ characterDelta: context.linkSuffix.length });
 		const replacementRange = new vscode.Range(pathSegmentStart, pathSegmentEnd);
 
-		let dirInfo: Array<[string, vscode.FileType]>;
-		try {
-			dirInfo = await vscode.workspace.fs.readDirectory(parentDir);
-		} catch {
-			return;
-		}
-
+		const dirInfo = await this.workspace.readDirectory(parentDir);
 		for (const [name, type] of dirInfo) {
 			// Exclude paths that start with `.`
 			if (name.startsWith('.')) {
@@ -328,7 +325,7 @@ export class MdVsCodePathCompletionProvider implements vscode.CompletionItemProv
 
 	private resolvePath(root: vscode.Uri, ref: string): vscode.Uri | undefined {
 		try {
-			if (root.scheme === 'file') {
+			if (root.scheme === Schemes.file) {
 				return vscode.Uri.file(resolve(dirname(root.fsPath), ref));
 			} else {
 				return root.with({
@@ -356,8 +353,9 @@ export class MdVsCodePathCompletionProvider implements vscode.CompletionItemProv
 
 export function registerPathCompletionSupport(
 	selector: vscode.DocumentSelector,
+	workspace: IMdWorkspace,
 	parser: IMdParser,
 	linkProvider: MdLinkProvider,
 ): vscode.Disposable {
-	return vscode.languages.registerCompletionItemProvider(selector, new MdVsCodePathCompletionProvider(parser, linkProvider), '.', '/', '#');
+	return vscode.languages.registerCompletionItemProvider(selector, new MdVsCodePathCompletionProvider(workspace, parser, linkProvider), '.', '/', '#');
 }

extensions/markdown-language-features/src/preview/preview.ts

@@ -14,6 +14,7 @@ import { isMarkdownFile } from '../util/file';
 import { openDocumentLink, resolveDocumentLink, resolveUriToMarkdownFile } from '../util/openDocumentLink';
 import { WebviewResourceProvider } from '../util/resources';
 import { urlToUri } from '../util/url';
+import { IMdWorkspace } from '../workspace';
 import { MdDocumentRenderer } from './documentRenderer';
 import { MarkdownPreviewConfigurationManager } from './previewConfig';
 import { scrollEditorToLine, StartingScrollFragment, StartingScrollLine, StartingScrollLocation } from './scrolling';
@@ -118,6 +119,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 		private readonly delegate: MarkdownPreviewDelegate,
 		private readonly _contentProvider: MdDocumentRenderer,
 		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
+		private readonly _workspace: IMdWorkspace,
 		private readonly _logger: ILogger,
 		private readonly _contributionProvider: MarkdownContributionProvider,
 		private readonly _tocProvider: MdTableOfContentsProvider,
@@ -449,7 +451,7 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 		const config = vscode.workspace.getConfiguration('markdown', this.resource);
 		const openLinks = config.get<string>('preview.openMarkdownLinks', 'inPreview');
 		if (openLinks === 'inPreview') {
-			const linkedDoc = await resolveUriToMarkdownFile(targetResource);
+			const linkedDoc = await resolveUriToMarkdownFile(this._workspace, targetResource);
 			if (linkedDoc) {
 				this.delegate.openPreviewLinkToMarkdownFile(linkedDoc.uri, targetResource.fragment);
 				return;
@@ -502,12 +504,13 @@ export class StaticMarkdownPreview extends Disposable implements IManagedMarkdow
 		contentProvider: MdDocumentRenderer,
 		previewConfigurations: MarkdownPreviewConfigurationManager,
 		topmostLineMonitor: TopmostLineMonitor,
+		workspace: IMdWorkspace,
 		logger: ILogger,
 		contributionProvider: MarkdownContributionProvider,
 		tocProvider: MdTableOfContentsProvider,
 		scrollLine?: number,
 	): StaticMarkdownPreview {
-		return new StaticMarkdownPreview(webview, resource, contentProvider, previewConfigurations, topmostLineMonitor, logger, contributionProvider, tocProvider, scrollLine);
+		return new StaticMarkdownPreview(webview, resource, contentProvider, previewConfigurations, topmostLineMonitor, workspace, logger, contributionProvider, tocProvider, scrollLine);
 	}
 
 	private readonly preview: MarkdownPreview;
@@ -518,6 +521,7 @@ export class StaticMarkdownPreview extends Disposable implements IManagedMarkdow
 		contentProvider: MdDocumentRenderer,
 		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
 		topmostLineMonitor: TopmostLineMonitor,
+		workspace: IMdWorkspace,
 		logger: ILogger,
 		contributionProvider: MarkdownContributionProvider,
 		tocProvider: MdTableOfContentsProvider,
@@ -532,7 +536,7 @@ export class StaticMarkdownPreview extends Disposable implements IManagedMarkdow
 					fragment
 				}), StaticMarkdownPreview.customEditorViewType, this._webviewPanel.viewColumn);
 			}
-		}, contentProvider, _previewConfigurations, logger, contributionProvider, tocProvider));
+		}, contentProvider, _previewConfigurations, workspace, logger, contributionProvider, tocProvider));
 
 		this._register(this._webviewPanel.onDidDispose(() => {
 			this.dispose();
@@ -613,6 +617,7 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 		webview: vscode.WebviewPanel,
 		contentProvider: MdDocumentRenderer,
 		previewConfigurations: MarkdownPreviewConfigurationManager,
+		workspace: IMdWorkspace,
 		logger: ILogger,
 		topmostLineMonitor: TopmostLineMonitor,
 		contributionProvider: MarkdownContributionProvider,
@@ -621,14 +626,15 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 		webview.iconPath = contentProvider.iconPath;
 
 		return new DynamicMarkdownPreview(webview, input,
-			contentProvider, previewConfigurations, logger, topmostLineMonitor, contributionProvider, tocProvider);
+			contentProvider, previewConfigurations, workspace, logger, topmostLineMonitor, contributionProvider, tocProvider);
 	}
 
 	public static create(
 		input: DynamicPreviewInput,
 		previewColumn: vscode.ViewColumn,
 		contentProvider: MdDocumentRenderer,
 		previewConfigurations: MarkdownPreviewConfigurationManager,
+		workspace: IMdWorkspace,
 		logger: ILogger,
 		topmostLineMonitor: TopmostLineMonitor,
 		contributionProvider: MarkdownContributionProvider,
@@ -642,14 +648,15 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 		webview.iconPath = contentProvider.iconPath;
 
 		return new DynamicMarkdownPreview(webview, input,
-			contentProvider, previewConfigurations, logger, topmostLineMonitor, contributionProvider, tocProvider);
+			contentProvider, previewConfigurations, workspace, logger, topmostLineMonitor, contributionProvider, tocProvider);
 	}
 
 	private constructor(
 		webview: vscode.WebviewPanel,
 		input: DynamicPreviewInput,
 		private readonly _contentProvider: MdDocumentRenderer,
 		private readonly _previewConfigurations: MarkdownPreviewConfigurationManager,
+		private readonly _workspace: IMdWorkspace,
 		private readonly _logger: ILogger,
 		private readonly _topmostLineMonitor: TopmostLineMonitor,
 		private readonly _contributionProvider: MarkdownContributionProvider,
@@ -807,6 +814,7 @@ export class DynamicMarkdownPreview extends Disposable implements IManagedMarkdo
 		},
 			this._contentProvider,
 			this._previewConfigurations,
+			this._workspace,
 			this._logger,
 			this._contributionProvider,
 			this._tocProvider);

extensions/markdown-language-features/src/preview/previewManager.ts

@@ -9,6 +9,7 @@ import { MarkdownContributionProvider } from '../markdownExtensions';
 import { MdTableOfContentsProvider } from '../tableOfContents';
 import { Disposable, disposeAll } from '../util/dispose';
 import { isMarkdownFile } from '../util/file';
+import { IMdWorkspace } from '../workspace';
 import { MdDocumentRenderer } from './documentRenderer';
 import { DynamicMarkdownPreview, IManagedMarkdownPreview, StaticMarkdownPreview } from './preview';
 import { MarkdownPreviewConfigurationManager } from './previewConfig';
@@ -69,6 +70,7 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 
 	public constructor(
 		private readonly _contentProvider: MdDocumentRenderer,
+		private readonly _workspace: IMdWorkspace,
 		private readonly _logger: ILogger,
 		private readonly _contributions: MarkdownContributionProvider,
 		private readonly _tocProvider: MdTableOfContentsProvider,
@@ -163,6 +165,7 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 			webview,
 			this._contentProvider,
 			this._previewConfigurations,
+			this._workspace,
 			this._logger,
 			this._topmostLineMonitor,
 			this._contributions,
@@ -182,6 +185,7 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 			this._contentProvider,
 			this._previewConfigurations,
 			this._topmostLineMonitor,
+			this._workspace,
 			this._logger,
 			this._contributions,
 			this._tocProvider,
@@ -206,6 +210,7 @@ export class MarkdownPreviewManager extends Disposable implements vscode.Webview
 			previewSettings.previewColumn,
 			this._contentProvider,
 			this._previewConfigurations,
+			this._workspace,
 			this._logger,
 			this._topmostLineMonitor,
 			this._contributions,

extensions/markdown-language-features/src/test/inMemoryWorkspace.ts

@@ -35,6 +35,19 @@ export class InMemoryMdWorkspace implements IMdWorkspace {
 		return this._documents.has(resource);
 	}
 
+	public async readDirectory(resource: vscode.Uri): Promise<[string, vscode.FileType][]> {
+		const files = new Map<string, vscode.FileType>();
+		const pathPrefix = resource.fsPath + (resource.fsPath.endsWith('/') ? '' : '/');
+		for (const doc of this._documents.values()) {
+			const path = doc.uri.fsPath;
+			if (path.startsWith(pathPrefix)) {
+				const parts = path.slice(pathPrefix.length).split('/');
+				files.set(parts[0], parts.length > 1 ? vscode.FileType.Directory : vscode.FileType.File);
+			}
+		}
+		return Array.from(files.entries());
+	}
+
 	private readonly _onDidChangeMarkdownDocumentEmitter = new vscode.EventEmitter<ITextDocument>();
 	public onDidChangeMarkdownDocument = this._onDidChangeMarkdownDocumentEmitter.event;