Rename types in the markdown extension (#152905)

Renames in the markdown extension

This renames some types and splits up some files as part of an exploration towards a proper LSP. Changes:

- `SkinnyTextDocument` -> `ITextDocument`
- Moved `ITextDocument` to own file
- `MdWorkspaceContents` -> `IMdWorkspace`

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

@@ -11,14 +11,14 @@ import { MdReferencesProvider } from '../languageFeatures/references';
 import { MdTableOfContentsProvider } from '../tableOfContents';
 import { noopToken } from '../util/cancellation';
 import { InMemoryDocument } from '../util/inMemoryDocument';
-import { MdWorkspaceContents } from '../workspaceContents';
+import { IMdWorkspace } from '../workspace';
 import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { InMemoryMdWorkspace } from './inMemoryWorkspace';
 import { nulLogger } from './nulLogging';
 import { joinLines, workspacePath } from './util';
 
 
-function getDefinition(doc: InMemoryDocument, pos: vscode.Position, workspace: MdWorkspaceContents) {
+function getDefinition(doc: InMemoryDocument, pos: vscode.Position, workspace: IMdWorkspace) {
 	const engine = createNewMarkdownEngine();
 	const referencesProvider = new MdReferencesProvider(engine, workspace, new MdTableOfContentsProvider(engine, workspace, nulLogger), nulLogger);
 	const provider = new MdVsCodeDefinitionProvider(referencesProvider);
@@ -52,7 +52,7 @@ suite('markdown: Go to definition', () => {
 			`[ref]: http://example.com`,
 		));
 
-		const defs = await getDefinition(doc, new vscode.Position(0, 1), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const defs = await getDefinition(doc, new vscode.Position(0, 1), new InMemoryMdWorkspace([doc]));
 		assert.deepStrictEqual(defs, undefined);
 	});
 
@@ -64,7 +64,7 @@ suite('markdown: Go to definition', () => {
 			`[abc]: https://example.com`,
 		));
 
-		const defs = await getDefinition(doc, new vscode.Position(0, 12), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const defs = await getDefinition(doc, new vscode.Position(0, 12), new InMemoryMdWorkspace([doc]));
 		assertDefinitionsEqual(defs!,
 			{ uri: docUri, line: 2 },
 		);
@@ -81,19 +81,19 @@ suite('markdown: Go to definition', () => {
 		));
 
 		{
-			const defs = await getDefinition(doc, new vscode.Position(0, 2), new InMemoryWorkspaceMarkdownDocuments([doc]));
+			const defs = await getDefinition(doc, new vscode.Position(0, 2), new InMemoryMdWorkspace([doc]));
 			assertDefinitionsEqual(defs!,
 				{ uri: docUri, line: 4 },
 			);
 		}
 		{
-			const defs = await getDefinition(doc, new vscode.Position(2, 7), new InMemoryWorkspaceMarkdownDocuments([doc]));
+			const defs = await getDefinition(doc, new vscode.Position(2, 7), new InMemoryMdWorkspace([doc]));
 			assertDefinitionsEqual(defs!,
 				{ uri: docUri, line: 4 },
 			);
 		}
 		{
-			const defs = await getDefinition(doc, new vscode.Position(4, 2), new InMemoryWorkspaceMarkdownDocuments([doc]));
+			const defs = await getDefinition(doc, new vscode.Position(4, 2), new InMemoryMdWorkspace([doc]));
 			assertDefinitionsEqual(defs!,
 				{ uri: docUri, line: 4 },
 			);
@@ -108,7 +108,7 @@ suite('markdown: Go to definition', () => {
 			`[abc]: https://example.com`, // trigger here
 		));
 
-		const defs = await getDefinition(doc, new vscode.Position(2, 3), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const defs = await getDefinition(doc, new vscode.Position(2, 3), new InMemoryMdWorkspace([doc]));
 		assertDefinitionsEqual(defs!,
 			{ uri: docUri, line: 2 },
 		);
@@ -122,7 +122,7 @@ suite('markdown: Go to definition', () => {
 			`[abc]: https://example.com`,
 		));
 
-		const defs = await getDefinition(doc, new vscode.Position(0, 12), new InMemoryWorkspaceMarkdownDocuments([
+		const defs = await getDefinition(doc, new vscode.Position(0, 12), new InMemoryMdWorkspace([
 			doc,
 			new InMemoryDocument(workspacePath('other.md'), joinLines(
 				`[link 1][abc]`,

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

@@ -14,9 +14,9 @@ import { noopToken } from '../util/cancellation';
 import { disposeAll } from '../util/dispose';
 import { InMemoryDocument } from '../util/inMemoryDocument';
 import { ResourceMap } from '../util/resourceMap';
-import { MdWorkspaceContents } from '../workspaceContents';
+import { IMdWorkspace } from '../workspace';
 import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { InMemoryMdWorkspace } from './inMemoryWorkspace';
 import { nulLogger } from './nulLogging';
 import { assertRangeEqual, joinLines, workspacePath } from './util';
 
@@ -29,7 +29,7 @@ const defaultDiagnosticsOptions = Object.freeze<DiagnosticOptions>({
 	ignoreLinks: [],
 });
 
-async function getComputedDiagnostics(doc: InMemoryDocument, workspace: MdWorkspaceContents, options: Partial<DiagnosticOptions> = {}): Promise<vscode.Diagnostic[]> {
+async function getComputedDiagnostics(doc: InMemoryDocument, workspace: IMdWorkspace, options: Partial<DiagnosticOptions> = {}): Promise<vscode.Diagnostic[]> {
 	const engine = createNewMarkdownEngine();
 	const linkProvider = new MdLinkProvider(engine, workspace, nulLogger);
 	const tocProvider = new MdTableOfContentsProvider(engine, workspace, nulLogger);
@@ -113,7 +113,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`text`,
 		));
 
-		const diagnostics = await getComputedDiagnostics(doc, new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const diagnostics = await getComputedDiagnostics(doc, new InMemoryMdWorkspace([doc]));
 		assert.deepStrictEqual(diagnostics, []);
 	});
 
@@ -125,7 +125,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`[bad-ref]: /no/such/file.md`,
 		));
 
-		const diagnostics = await getComputedDiagnostics(doc, new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const diagnostics = await getComputedDiagnostics(doc, new InMemoryMdWorkspace([doc]));
 		assertDiagnosticsEqual(diagnostics, [
 			new vscode.Range(0, 6, 0, 22),
 			new vscode.Range(3, 11, 3, 27),
@@ -142,7 +142,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`[bad-ref]: #no-such-header`,
 		));
 
-		const diagnostics = await getComputedDiagnostics(doc, new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const diagnostics = await getComputedDiagnostics(doc, new InMemoryMdWorkspace([doc]));
 		assertDiagnosticsEqual(diagnostics, [
 			new vscode.Range(2, 6, 2, 21),
 			new vscode.Range(5, 11, 5, 26),
@@ -163,7 +163,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`# Other header`,
 		));
 
-		const diagnostics = await getComputedDiagnostics(doc1, new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]));
+		const diagnostics = await getComputedDiagnostics(doc1, new InMemoryMdWorkspace([doc1, doc2]));
 		assertDiagnosticsEqual(diagnostics, [
 			new vscode.Range(5, 14, 5, 35),
 		]);
@@ -179,7 +179,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`[good](doc#my-header)`,
 		));
 
-		const diagnostics = await getComputedDiagnostics(doc, new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const diagnostics = await getComputedDiagnostics(doc, new InMemoryMdWorkspace([doc]));
 		assertDiagnosticsEqual(diagnostics, []);
 	});
 
@@ -191,7 +191,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`[good]: http://example.com`,
 		));
 
-		const diagnostics = await getComputedDiagnostics(doc, new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const diagnostics = await getComputedDiagnostics(doc, new InMemoryMdWorkspace([doc]));
 		assertDiagnosticsEqual(diagnostics, [
 			new vscode.Range(1, 11, 1, 18),
 		]);
@@ -203,7 +203,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`[text][no-such-ref]`,
 		));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1]);
+		const workspace = new InMemoryMdWorkspace([doc1]);
 		const diagnostics = await getComputedDiagnostics(doc1, workspace, new MemoryDiagnosticConfiguration({ enabled: false }).getOptions(doc1.uri));
 		assertDiagnosticsEqual(diagnostics, []);
 	});
@@ -213,7 +213,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`a <user@example.com> c`,
 		));
 
-		const diagnostics = await getComputedDiagnostics(doc1, new InMemoryWorkspaceMarkdownDocuments([doc1]));
+		const diagnostics = await getComputedDiagnostics(doc1, new InMemoryMdWorkspace([doc1]));
 		assertDiagnosticsEqual(diagnostics, []);
 	});
 
@@ -223,7 +223,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`a <scope:tag>b</scope:tag> c`,
 		));
 
-		const diagnostics = await getComputedDiagnostics(doc1, new InMemoryWorkspaceMarkdownDocuments([doc1]));
+		const diagnostics = await getComputedDiagnostics(doc1, new InMemoryMdWorkspace([doc1]));
 		assertDiagnosticsEqual(diagnostics, []);
 	});
 
@@ -234,7 +234,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`[text]: /no-such-file`,
 		));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1]);
+		const workspace = new InMemoryMdWorkspace([doc1]);
 		const diagnostics = await getComputedDiagnostics(doc1, workspace, { ignoreLinks: ['/no-such-file'] });
 		assertDiagnosticsEqual(diagnostics, []);
 	});
@@ -245,7 +245,7 @@ suite('markdown: Diagnostic Computer', () => {
 		));
 		const doc2 = new InMemoryDocument(workspacePath('doc2.md'), joinLines(''));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]);
+		const workspace = new InMemoryMdWorkspace([doc1, doc2]);
 
 		const diagnostics = await getComputedDiagnostics(doc1, workspace, { validateMarkdownFileLinkFragments: DiagnosticLevel.ignore });
 		assertDiagnosticsEqual(diagnostics, []);
@@ -258,7 +258,7 @@ suite('markdown: Diagnostic Computer', () => {
 		));
 		const doc2 = new InMemoryDocument(workspacePath('doc2.md'), joinLines(''));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]);
+		const workspace = new InMemoryMdWorkspace([doc1, doc2]);
 
 		{
 			const diagnostics = await getComputedDiagnostics(doc1, workspace, { validateFragmentLinks: DiagnosticLevel.ignore });
@@ -278,7 +278,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`[text](/no-such-file#header)`,
 		));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1]);
+		const workspace = new InMemoryMdWorkspace([doc1]);
 
 		const diagnostics = await getComputedDiagnostics(doc1, workspace, { ignoreLinks: ['/no-such-file'] });
 		assertDiagnosticsEqual(diagnostics, []);
@@ -289,7 +289,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`[text](/no-such-file#header)`,
 		));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1]);
+		const workspace = new InMemoryMdWorkspace([doc1]);
 
 		const diagnostics = await getComputedDiagnostics(doc1, workspace, { ignoreLinks: ['/no-such-file'] });
 		assertDiagnosticsEqual(diagnostics, []);
@@ -302,7 +302,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`![i](/images/sub/sub2/ccc.png)`,
 		));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1]);
+		const workspace = new InMemoryMdWorkspace([doc1]);
 		const diagnostics = await getComputedDiagnostics(doc1, workspace, { ignoreLinks: ['/images/**/*.png'] });
 		assertDiagnosticsEqual(diagnostics, []);
 	});
@@ -311,7 +311,7 @@ suite('markdown: Diagnostic Computer', () => {
 		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
 			`![i](#no-such)`,
 		));
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1]);
+		const workspace = new InMemoryMdWorkspace([doc1]);
 
 		const diagnostics = await getComputedDiagnostics(doc1, workspace, { ignoreLinks: ['#no-such'] });
 		assertDiagnosticsEqual(diagnostics, []);
@@ -323,7 +323,7 @@ suite('markdown: Diagnostic Computer', () => {
 		));
 		const doc2 = new InMemoryDocument(workspacePath('doc2.md'), joinLines(''));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]);
+		const workspace = new InMemoryMdWorkspace([doc1, doc2]);
 		{
 			const diagnostics = await getComputedDiagnostics(doc1, workspace, { ignoreLinks: ['/doc2.md#no-such'] });
 			assertDiagnosticsEqual(diagnostics, []);
@@ -340,7 +340,7 @@ suite('markdown: Diagnostic Computer', () => {
 		));
 		const doc2 = new InMemoryDocument(workspacePath('doc2.md'), joinLines(''));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]);
+		const workspace = new InMemoryMdWorkspace([doc1, doc2]);
 
 		const diagnostics = await getComputedDiagnostics(doc1, workspace, { ignoreLinks: ['/doc2.md'] });
 		assertDiagnosticsEqual(diagnostics, []);
@@ -353,7 +353,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`- [ ]`,
 		));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1]);
+		const workspace = new InMemoryMdWorkspace([doc1]);
 
 		const diagnostics = await getComputedDiagnostics(doc1, workspace, { ignoreLinks: ['/doc2.md'] });
 		assertDiagnosticsEqual(diagnostics, []);
@@ -368,7 +368,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`[link](no-such.md 'text')`,
 			`[link](no-such.md (text))`,
 		));
-		const diagnostics = await getComputedDiagnostics(doc, new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const diagnostics = await getComputedDiagnostics(doc, new InMemoryMdWorkspace([doc]));
 		assertDiagnosticsEqual(diagnostics, [
 			new vscode.Range(0, 8, 0, 18),
 			new vscode.Range(1, 8, 1, 18),
@@ -387,7 +387,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`[bad](/sub/doc#no-such)`,
 		));
 
-		const diagnostics = await getComputedDiagnostics(doc, new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const diagnostics = await getComputedDiagnostics(doc, new InMemoryMdWorkspace([doc]));
 		assertDiagnosticsEqual(orderDiagnosticsByRange(diagnostics), [
 			new vscode.Range(0, 12, 0, 20),
 			new vscode.Range(1, 9, 1, 17),
@@ -404,7 +404,7 @@ suite('markdown: Diagnostic Computer', () => {
 			`[bad](/sub/doc#no-such)`,
 		));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1]);
+		const workspace = new InMemoryMdWorkspace([doc1]);
 
 		const diagnostics = await getComputedDiagnostics(doc1, workspace, {
 			validateFragmentLinks: DiagnosticLevel.ignore,
@@ -432,7 +432,7 @@ suite('Markdown: Diagnostics manager', () => {
 	});
 
 	function createDiagnosticsManager(
-		workspace: MdWorkspaceContents,
+		workspace: IMdWorkspace,
 		configuration = new MemoryDiagnosticConfiguration({}),
 		reporter: DiagnosticReporter = new DiagnosticCollectionReporter(),
 	) {
@@ -456,7 +456,7 @@ suite('Markdown: Diagnostics manager', () => {
 	test('Changing enable/disable should recompute diagnostics', async () => {
 		const doc1Uri = workspacePath('doc1.md');
 		const doc2Uri = workspacePath('doc2.md');
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([
+		const workspace = new InMemoryMdWorkspace([
 			new InMemoryDocument(doc1Uri, joinLines(
 				`[text](#no-such-1)`,
 			)),
@@ -510,7 +510,7 @@ suite('Markdown: Diagnostics manager', () => {
 			`[text](#no-such-2)`,
 		));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]);
+		const workspace = new InMemoryMdWorkspace([doc1, doc2]);
 		const reporter = new MemoryDiagnosticReporter();
 
 		const manager = createDiagnosticsManager(workspace, new MemoryDiagnosticConfiguration({}), reporter);
@@ -566,7 +566,7 @@ suite('Markdown: Diagnostics manager', () => {
 			`# Header`
 		));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]);
+		const workspace = new InMemoryMdWorkspace([doc1, doc2]);
 		const reporter = new MemoryDiagnosticReporter();
 
 		const manager = createDiagnosticsManager(workspace, new MemoryDiagnosticConfiguration({}), reporter);

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

@@ -7,13 +7,13 @@ import * as assert from 'assert';
 import 'mocha';
 import { InMemoryDocument } from '../util/inMemoryDocument';
 import { MdDocumentInfoCache } from '../util/workspaceCache';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { InMemoryMdWorkspace } from './inMemoryWorkspace';
 import { workspacePath } from './util';
 
 suite('DocumentInfoCache', () => {
 	test('Repeated calls should only compute value once', async () => {
 		const doc = workspacePath('doc.md');
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([
+		const workspace = new InMemoryMdWorkspace([
 			new InMemoryDocument(doc, '')
 		]);
 

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

@@ -10,14 +10,14 @@ import { MdLinkProvider, MdVsCodeLinkProvider } from '../languageFeatures/docume
 import { noopToken } from '../util/cancellation';
 import { InMemoryDocument } from '../util/inMemoryDocument';
 import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { InMemoryMdWorkspace } from './inMemoryWorkspace';
 import { nulLogger } from './nulLogging';
 import { assertRangeEqual, joinLines, workspacePath } from './util';
 
 
 function getLinksForFile(fileContents: string) {
 	const doc = new InMemoryDocument(workspacePath('x.md'), fileContents);
-	const workspace = new InMemoryWorkspaceMarkdownDocuments([doc]);
+	const workspace = new InMemoryMdWorkspace([doc]);
 
 	const engine = createNewMarkdownEngine();
 	const linkProvider = new MdLinkProvider(engine, workspace, nulLogger);

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

@@ -9,14 +9,14 @@ import { MdDocumentSymbolProvider } from '../languageFeatures/documentSymbols';
 import { MdTableOfContentsProvider } from '../tableOfContents';
 import { InMemoryDocument } from '../util/inMemoryDocument';
 import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { InMemoryMdWorkspace } from './inMemoryWorkspace';
 import { nulLogger } from './nulLogging';
 import { workspacePath } from './util';
 
 
 function getSymbolsForFile(fileContents: string) {
 	const doc = new InMemoryDocument(workspacePath('test.md'), fileContents);
-	const workspace = new InMemoryWorkspaceMarkdownDocuments([doc]);
+	const workspace = new InMemoryMdWorkspace([doc]);
 	const engine = createNewMarkdownEngine();
 	const provider = new MdDocumentSymbolProvider(new MdTableOfContentsProvider(engine, workspace, nulLogger), nulLogger);
 	return provider.provideDocumentSymbols(doc);

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

@@ -6,8 +6,8 @@
 import * as assert from 'assert';
 import 'mocha';
 import * as vscode from 'vscode';
-import { createNewMarkdownEngine } from './engine';
 import { InMemoryDocument } from '../util/inMemoryDocument';
+import { createNewMarkdownEngine } from './engine';
 
 
 const testFileName = vscode.Uri.file('test.md');

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

@@ -10,14 +10,14 @@ import { MdReference, MdReferencesProvider } from '../languageFeatures/reference
 import { MdTableOfContentsProvider } from '../tableOfContents';
 import { noopToken } from '../util/cancellation';
 import { InMemoryDocument } from '../util/inMemoryDocument';
-import { MdWorkspaceContents } from '../workspaceContents';
+import { IMdWorkspace } from '../workspace';
 import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { InMemoryMdWorkspace } from './inMemoryWorkspace';
 import { nulLogger } from './nulLogging';
 import { joinLines, workspacePath } from './util';
 
 
-function getFileReferences(resource: vscode.Uri, workspace: MdWorkspaceContents) {
+function getFileReferences(resource: vscode.Uri, workspace: IMdWorkspace) {
 	const engine = createNewMarkdownEngine();
 	const computer = new MdReferencesProvider(engine, workspace, new MdTableOfContentsProvider(engine, workspace, nulLogger), nulLogger);
 	return computer.getAllReferencesToFile(resource, noopToken);
@@ -41,7 +41,7 @@ suite('markdown: find file references', () => {
 		const docUri = workspacePath('doc.md');
 		const otherUri = workspacePath('other.md');
 
-		const refs = await getFileReferences(otherUri, new InMemoryWorkspaceMarkdownDocuments([
+		const refs = await getFileReferences(otherUri, new InMemoryMdWorkspace([
 			new InMemoryDocument(docUri, joinLines(
 				`# header`,
 				`[link 1](./other.md)`,
@@ -66,7 +66,7 @@ suite('markdown: find file references', () => {
 		const docUri = workspacePath('doc.md');
 		const otherUri = workspacePath('other.md');
 
-		const refs = await getFileReferences(otherUri, new InMemoryWorkspaceMarkdownDocuments([
+		const refs = await getFileReferences(otherUri, new InMemoryMdWorkspace([
 			new InMemoryDocument(docUri, joinLines(
 				`# header`,
 				`[link 1](./other.md)`,
@@ -93,7 +93,7 @@ suite('markdown: find file references', () => {
 		const docUri = workspacePath('doc.md');
 		const otherUri = workspacePath('other.md');
 
-		const refs = await getFileReferences(otherUri, new InMemoryWorkspaceMarkdownDocuments([
+		const refs = await getFileReferences(otherUri, new InMemoryMdWorkspace([
 			new InMemoryDocument(docUri, joinLines(
 				`# header`,
 				`[link 1](./other.md#sub-bla)`,

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

@@ -10,7 +10,7 @@ import { MdFoldingProvider } from '../languageFeatures/folding';
 import { MdTableOfContentsProvider } from '../tableOfContents';
 import { InMemoryDocument } from '../util/inMemoryDocument';
 import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { InMemoryMdWorkspace } from './inMemoryWorkspace';
 import { nulLogger } from './nulLogging';
 import { joinLines } from './util';
 
@@ -221,7 +221,7 @@ suite('markdown.FoldingProvider', () => {
 
 async function getFoldsForDocument(contents: string) {
 	const doc = new InMemoryDocument(testFileName, contents);
-	const workspace = new InMemoryWorkspaceMarkdownDocuments([doc]);
+	const workspace = new InMemoryMdWorkspace([doc]);
 	const engine = createNewMarkdownEngine();
 	const provider = new MdFoldingProvider(engine, new MdTableOfContentsProvider(engine, workspace, nulLogger));
 	return await provider.provideFoldingRanges(doc, {}, new vscode.CancellationTokenSource().token);

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

@@ -5,14 +5,15 @@
 
 import * as assert from 'assert';
 import * as vscode from 'vscode';
+import { ITextDocument } from '../types/textDocument';
 import { ResourceMap } from '../util/resourceMap';
-import { MdWorkspaceContents, SkinnyTextDocument } from '../workspaceContents';
+import { IMdWorkspace } from '../workspace';
 
 
-export class InMemoryWorkspaceMarkdownDocuments implements MdWorkspaceContents {
-	private readonly _documents = new ResourceMap<SkinnyTextDocument>(uri => uri.fsPath);
+export class InMemoryMdWorkspace implements IMdWorkspace {
+	private readonly _documents = new ResourceMap<ITextDocument>(uri => uri.fsPath);
 
-	constructor(documents: SkinnyTextDocument[]) {
+	constructor(documents: ITextDocument[]) {
 		for (const doc of documents) {
 			this._documents.set(doc.uri, doc);
 		}
@@ -22,7 +23,7 @@ export class InMemoryWorkspaceMarkdownDocuments implements MdWorkspaceContents {
 		return Array.from(this._documents.values());
 	}
 
-	public async getOrLoadMarkdownDocument(resource: vscode.Uri): Promise<SkinnyTextDocument | undefined> {
+	public async getOrLoadMarkdownDocument(resource: vscode.Uri): Promise<ITextDocument | undefined> {
 		return this._documents.get(resource);
 	}
 
@@ -34,21 +35,21 @@ export class InMemoryWorkspaceMarkdownDocuments implements MdWorkspaceContents {
 		return this._documents.has(resource);
 	}
 
-	private readonly _onDidChangeMarkdownDocumentEmitter = new vscode.EventEmitter<SkinnyTextDocument>();
+	private readonly _onDidChangeMarkdownDocumentEmitter = new vscode.EventEmitter<ITextDocument>();
 	public onDidChangeMarkdownDocument = this._onDidChangeMarkdownDocumentEmitter.event;
 
-	private readonly _onDidCreateMarkdownDocumentEmitter = new vscode.EventEmitter<SkinnyTextDocument>();
+	private readonly _onDidCreateMarkdownDocumentEmitter = new vscode.EventEmitter<ITextDocument>();
 	public onDidCreateMarkdownDocument = this._onDidCreateMarkdownDocumentEmitter.event;
 
 	private readonly _onDidDeleteMarkdownDocumentEmitter = new vscode.EventEmitter<vscode.Uri>();
 	public onDidDeleteMarkdownDocument = this._onDidDeleteMarkdownDocumentEmitter.event;
 
-	public updateDocument(document: SkinnyTextDocument) {
+	public updateDocument(document: ITextDocument) {
 		this._documents.set(document.uri, document);
 		this._onDidChangeMarkdownDocumentEmitter.fire(document);
 	}
 
-	public createDocument(document: SkinnyTextDocument) {
+	public createDocument(document: ITextDocument) {
 		assert.ok(!this._documents.has(document.uri));
 
 		this._documents.set(document.uri, document);

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

@@ -11,14 +11,14 @@ import { MdVsCodePathCompletionProvider } from '../languageFeatures/pathCompleti
 import { noopToken } from '../util/cancellation';
 import { InMemoryDocument } from '../util/inMemoryDocument';
 import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { InMemoryMdWorkspace } from './inMemoryWorkspace';
 import { nulLogger } from './nulLogging';
 import { CURSOR, getCursorPositions, joinLines, workspacePath } from './util';
 
 
 function getCompletionsAtCursor(resource: vscode.Uri, fileContents: string) {
 	const doc = new InMemoryDocument(resource, fileContents);
-	const workspace = new InMemoryWorkspaceMarkdownDocuments([doc]);
+	const workspace = new InMemoryMdWorkspace([doc]);
 
 	const engine = createNewMarkdownEngine();
 	const linkProvider = new MdLinkProvider(engine, workspace, nulLogger);

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

@@ -10,14 +10,14 @@ import { MdReferencesProvider, MdVsCodeReferencesProvider } from '../languageFea
 import { MdTableOfContentsProvider } from '../tableOfContents';
 import { noopToken } from '../util/cancellation';
 import { InMemoryDocument } from '../util/inMemoryDocument';
-import { MdWorkspaceContents } from '../workspaceContents';
+import { IMdWorkspace } from '../workspace';
 import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { InMemoryMdWorkspace } from './inMemoryWorkspace';
 import { nulLogger } from './nulLogging';
 import { joinLines, workspacePath } from './util';
 
 
-function getReferences(doc: InMemoryDocument, pos: vscode.Position, workspace: MdWorkspaceContents) {
+function getReferences(doc: InMemoryDocument, pos: vscode.Position, workspace: IMdWorkspace) {
 	const engine = createNewMarkdownEngine();
 	const computer = new MdReferencesProvider(engine, workspace, new MdTableOfContentsProvider(engine, workspace, nulLogger), nulLogger);
 	const provider = new MdVsCodeReferencesProvider(computer);
@@ -52,11 +52,11 @@ suite('markdown: find all references', () => {
 		));
 
 		{
-			const refs = await getReferences(doc, new vscode.Position(1, 0), new InMemoryWorkspaceMarkdownDocuments([doc]));
+			const refs = await getReferences(doc, new vscode.Position(1, 0), new InMemoryMdWorkspace([doc]));
 			assert.deepStrictEqual(refs, []);
 		}
 		{
-			const refs = await getReferences(doc, new vscode.Position(3, 2), new InMemoryWorkspaceMarkdownDocuments([doc]));
+			const refs = await getReferences(doc, new vscode.Position(3, 2), new InMemoryMdWorkspace([doc]));
 			assert.deepStrictEqual(refs, []);
 		}
 	});
@@ -70,7 +70,7 @@ suite('markdown: find all references', () => {
 			`[not link](#noabc)`,
 			`[link 2](#abc)`,
 		));
-		const refs = await getReferences(doc, new vscode.Position(0, 3), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const refs = await getReferences(doc, new vscode.Position(0, 3), new InMemoryMdWorkspace([doc]));
 		assertReferencesEqual(refs!,
 			{ uri, line: 0 },
 			{ uri, line: 2 },
@@ -84,7 +84,7 @@ suite('markdown: find all references', () => {
 			`[ref]: http://example.com`,
 		));
 
-		const refs = await getReferences(doc, new vscode.Position(0, 1), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const refs = await getReferences(doc, new vscode.Position(0, 1), new InMemoryMdWorkspace([doc]));
 		assert.deepStrictEqual(refs, []);
 	});
 
@@ -98,22 +98,22 @@ suite('markdown: find all references', () => {
 
 		{
 			// Trigger header
-			const refs = await getReferences(doc, new vscode.Position(0, 0), new InMemoryWorkspaceMarkdownDocuments([doc]));
+			const refs = await getReferences(doc, new vscode.Position(0, 0), new InMemoryMdWorkspace([doc]));
 			assert.deepStrictEqual(refs!.length, 4);
 		}
 		{
 			// Trigger on line 1
-			const refs = await getReferences(doc, new vscode.Position(1, 12), new InMemoryWorkspaceMarkdownDocuments([doc]));
+			const refs = await getReferences(doc, new vscode.Position(1, 12), new InMemoryMdWorkspace([doc]));
 			assert.deepStrictEqual(refs!.length, 4);
 		}
 		{
 			// Trigger on line 2
-			const refs = await getReferences(doc, new vscode.Position(2, 24), new InMemoryWorkspaceMarkdownDocuments([doc]));
+			const refs = await getReferences(doc, new vscode.Position(2, 24), new InMemoryMdWorkspace([doc]));
 			assert.deepStrictEqual(refs!.length, 4);
 		}
 		{
 			// Trigger on line 3
-			const refs = await getReferences(doc, new vscode.Position(3, 20), new InMemoryWorkspaceMarkdownDocuments([doc]));
+			const refs = await getReferences(doc, new vscode.Position(3, 20), new InMemoryMdWorkspace([doc]));
 			assert.deepStrictEqual(refs!.length, 4);
 		}
 	});
@@ -128,7 +128,7 @@ suite('markdown: find all references', () => {
 			``,
 			`[link 1](#abc)`,
 		));
-		const refs = await getReferences(doc, new vscode.Position(0, 3), new InMemoryWorkspaceMarkdownDocuments([
+		const refs = await getReferences(doc, new vscode.Position(0, 3), new InMemoryMdWorkspace([
 			doc,
 			new InMemoryDocument(other1Uri, joinLines(
 				`[not link](#abc)`,
@@ -158,7 +158,7 @@ suite('markdown: find all references', () => {
 			`[bla]: #abc`
 		));
 
-		const refs = await getReferences(doc, new vscode.Position(0, 3), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const refs = await getReferences(doc, new vscode.Position(0, 3), new InMemoryMdWorkspace([doc]));
 		assertReferencesEqual(refs!,
 			{ uri, line: 0 }, // Header definition
 			{ uri, line: 2 },
@@ -173,7 +173,7 @@ suite('markdown: find all references', () => {
 			`[bla]: #a-b-c`, // trigger here
 		));
 
-		const refs = await getReferences(doc, new vscode.Position(2, 9), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const refs = await getReferences(doc, new vscode.Position(2, 9), new InMemoryMdWorkspace([doc]));
 		assertReferencesEqual(refs!,
 			{ uri, line: 0 }, // Header definition
 			{ uri, line: 2 },
@@ -190,7 +190,7 @@ suite('markdown: find all references', () => {
 			`[link 2](#abc)`,
 		));
 
-		const refs = await getReferences(doc, new vscode.Position(2, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const refs = await getReferences(doc, new vscode.Position(2, 10), new InMemoryMdWorkspace([doc]));
 		assertReferencesEqual(refs!,
 			{ uri, line: 0 }, // Header definition
 			{ uri, line: 2 },
@@ -208,7 +208,7 @@ suite('markdown: find all references', () => {
 			``,
 			`[link 1](#abc)`,
 		));
-		const refs = await getReferences(doc, new vscode.Position(2, 10), new InMemoryWorkspaceMarkdownDocuments([
+		const refs = await getReferences(doc, new vscode.Position(2, 10), new InMemoryMdWorkspace([
 			doc,
 			new InMemoryDocument(other1Uri, joinLines(
 				`[not link](#abc)`,
@@ -241,7 +241,7 @@ suite('markdown: find all references', () => {
 			``,
 			`[link 1](#a-b-c)`,
 		));
-		const refs = await getReferences(doc, new vscode.Position(2, 10), new InMemoryWorkspaceMarkdownDocuments([
+		const refs = await getReferences(doc, new vscode.Position(2, 10), new InMemoryMdWorkspace([
 			doc,
 			new InMemoryDocument(other1Uri, joinLines(
 				`[not link](#a-b-c)`,
@@ -272,7 +272,7 @@ suite('markdown: find all references', () => {
 			`[without ext](./sub/other.md#header)`,
 		));
 
-		const refs = await getReferences(doc, new vscode.Position(0, 23), new InMemoryWorkspaceMarkdownDocuments([
+		const refs = await getReferences(doc, new vscode.Position(0, 23), new InMemoryMdWorkspace([
 			doc,
 			new InMemoryDocument(other1Uri, joinLines(
 				`pre`,
@@ -298,7 +298,7 @@ suite('markdown: find all references', () => {
 			`[without ext](./sub/other.md#no-such-header)`,
 		));
 
-		const refs = await getReferences(doc, new vscode.Position(0, 15), new InMemoryWorkspaceMarkdownDocuments([
+		const refs = await getReferences(doc, new vscode.Position(0, 15), new InMemoryMdWorkspace([
 			doc,
 			new InMemoryDocument(otherUri, joinLines(
 				`pre`,
@@ -322,7 +322,7 @@ suite('markdown: find all references', () => {
 			`[other](./sub/other)`, // trigger here
 		));
 
-		const refs = await getReferences(doc, new vscode.Position(0, 15), new InMemoryWorkspaceMarkdownDocuments([
+		const refs = await getReferences(doc, new vscode.Position(0, 15), new InMemoryMdWorkspace([
 			doc,
 			new InMemoryDocument(otherUri, joinLines(
 				`# header`, // Definition should not be included since we triggered on a file link
@@ -343,7 +343,7 @@ suite('markdown: find all references', () => {
 			`[abs](/doc.md)`,
 		));
 
-		const refs = await getReferences(doc, new vscode.Position(0, 12), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const refs = await getReferences(doc, new vscode.Position(0, 12), new InMemoryMdWorkspace([doc]));
 		assertReferencesEqual(refs!,
 			{ uri, line: 0 },
 			{ uri, line: 1 },
@@ -360,7 +360,7 @@ suite('markdown: find all references', () => {
 			`[3]: http://example.com`,
 		));
 
-		const refs = await getReferences(doc, new vscode.Position(0, 13), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const refs = await getReferences(doc, new vscode.Position(0, 13), new InMemoryMdWorkspace([doc]));
 		assertReferencesEqual(refs!,
 			{ uri, line: 0 },
 			{ uri, line: 2 },
@@ -380,7 +380,7 @@ suite('markdown: find all references', () => {
 			`[7](https://example.com/cat)`,
 		));
 
-		const refs = await getReferences(doc, new vscode.Position(0, 13), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const refs = await getReferences(doc, new vscode.Position(0, 13), new InMemoryMdWorkspace([doc]));
 		assertReferencesEqual(refs!,
 			{ uri, line: 0 },
 			{ uri, line: 4 },
@@ -395,7 +395,7 @@ suite('markdown: find all references', () => {
 			`[3]: http://example.com`,
 		));
 
-		const refs = await getReferences(doc, new vscode.Position(0, 13), new InMemoryWorkspaceMarkdownDocuments([
+		const refs = await getReferences(doc, new vscode.Position(0, 13), new InMemoryMdWorkspace([
 			doc,
 			new InMemoryDocument(uri2, joinLines(
 				`[other](http://example.com)`,
@@ -415,7 +415,7 @@ suite('markdown: find all references', () => {
 			`<http://example.com>`,
 		));
 
-		const refs = await getReferences(doc, new vscode.Position(0, 13), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const refs = await getReferences(doc, new vscode.Position(0, 13), new InMemoryMdWorkspace([doc]));
 		assertReferencesEqual(refs!,
 			{ uri, line: 0 },
 			{ uri, line: 1 },
@@ -435,13 +435,13 @@ suite('markdown: find all references', () => {
 			`[link](/doc.md#abc)`,
 			`[link no text](/doc#abc)`,
 		));
-		const workspaceContents = new InMemoryWorkspaceMarkdownDocuments([
+		const workspace = new InMemoryMdWorkspace([
 			doc,
 			otherDoc,
 		]);
 		{
 			// Check refs to header fragment
-			const headerRefs = await getReferences(otherDoc, new vscode.Position(0, 16), workspaceContents);
+			const headerRefs = await getReferences(otherDoc, new vscode.Position(0, 16), workspace);
 			assertReferencesEqual(headerRefs!,
 				{ uri: docUri, line: 0 }, // Header definition
 				{ uri: docUri, line: 2 },
@@ -451,7 +451,7 @@ suite('markdown: find all references', () => {
 		}
 		{
 			// Check refs to file itself from link with ext
-			const fileRefs = await getReferences(otherDoc, new vscode.Position(0, 9), workspaceContents);
+			const fileRefs = await getReferences(otherDoc, new vscode.Position(0, 9), workspace);
 			assertReferencesEqual(fileRefs!,
 				{ uri: other1Uri, line: 0, endCharacter: 14 },
 				{ uri: other1Uri, line: 1, endCharacter: 19 },
@@ -459,7 +459,7 @@ suite('markdown: find all references', () => {
 		}
 		{
 			// Check refs to file itself from link without ext
-			const fileRefs = await getReferences(otherDoc, new vscode.Position(1, 17), workspaceContents);
+			const fileRefs = await getReferences(otherDoc, new vscode.Position(1, 17), workspace);
 			assertReferencesEqual(fileRefs!,
 				{ uri: other1Uri, line: 0 },
 				{ uri: other1Uri, line: 1 },
@@ -481,7 +481,7 @@ suite('markdown: find all references', () => {
 		));
 
 
-		const refs = await getReferences(doc1, new vscode.Position(0, 10), new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]));
+		const refs = await getReferences(doc1, new vscode.Position(0, 10), new InMemoryMdWorkspace([doc1, doc2]));
 		assertReferencesEqual(refs!,
 			{ uri: uri1, line: 0 },
 			{ uri: uri1, line: 2 },
@@ -498,7 +498,7 @@ suite('markdown: find all references', () => {
 				`[abc]: https://example.com`,
 			));
 
-			const refs = await getReferences(doc, new vscode.Position(0, 12), new InMemoryWorkspaceMarkdownDocuments([doc]));
+			const refs = await getReferences(doc, new vscode.Position(0, 12), new InMemoryMdWorkspace([doc]));
 			assertReferencesEqual(refs!,
 				{ uri: docUri, line: 0 },
 				{ uri: docUri, line: 2 },
@@ -516,7 +516,7 @@ suite('markdown: find all references', () => {
 			));
 
 			{
-				const refs = await getReferences(doc, new vscode.Position(0, 2), new InMemoryWorkspaceMarkdownDocuments([doc]));
+				const refs = await getReferences(doc, new vscode.Position(0, 2), new InMemoryMdWorkspace([doc]));
 				assertReferencesEqual(refs!,
 					{ uri: docUri, line: 0 },
 					{ uri: docUri, line: 2 },
@@ -524,7 +524,7 @@ suite('markdown: find all references', () => {
 				);
 			}
 			{
-				const refs = await getReferences(doc, new vscode.Position(2, 7), new InMemoryWorkspaceMarkdownDocuments([doc]));
+				const refs = await getReferences(doc, new vscode.Position(2, 7), new InMemoryMdWorkspace([doc]));
 				assertReferencesEqual(refs!,
 					{ uri: docUri, line: 0 },
 					{ uri: docUri, line: 2 },
@@ -532,7 +532,7 @@ suite('markdown: find all references', () => {
 				);
 			}
 			{
-				const refs = await getReferences(doc, new vscode.Position(4, 2), new InMemoryWorkspaceMarkdownDocuments([doc]));
+				const refs = await getReferences(doc, new vscode.Position(4, 2), new InMemoryMdWorkspace([doc]));
 				assertReferencesEqual(refs!,
 					{ uri: docUri, line: 0 },
 					{ uri: docUri, line: 2 },
@@ -549,7 +549,7 @@ suite('markdown: find all references', () => {
 				`[abc]: https://example.com`, // trigger here
 			));
 
-			const refs = await getReferences(doc, new vscode.Position(2, 3), new InMemoryWorkspaceMarkdownDocuments([doc]));
+			const refs = await getReferences(doc, new vscode.Position(2, 3), new InMemoryMdWorkspace([doc]));
 			assertReferencesEqual(refs!,
 				{ uri: docUri, line: 0 },
 				{ uri: docUri, line: 2 },
@@ -564,7 +564,7 @@ suite('markdown: find all references', () => {
 				`[abc]: https://example.com`,
 			));
 
-			const refs = await getReferences(doc, new vscode.Position(0, 12), new InMemoryWorkspaceMarkdownDocuments([
+			const refs = await getReferences(doc, new vscode.Position(0, 12), new InMemoryMdWorkspace([
 				doc,
 				new InMemoryDocument(workspacePath('other.md'), joinLines(
 					`[link 1][abc]`,
@@ -588,7 +588,7 @@ suite('markdown: find all references', () => {
 				`[x]: https://example.com`
 			));
 
-			const refs = await getReferences(doc, new vscode.Position(0, 4), new InMemoryWorkspaceMarkdownDocuments([doc]));
+			const refs = await getReferences(doc, new vscode.Position(0, 4), new InMemoryMdWorkspace([doc]));
 			assert.strictEqual(refs?.length!, 0);
 		});
 	});

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

@@ -12,9 +12,9 @@ import { githubSlugifier } from '../slugify';
 import { MdTableOfContentsProvider } from '../tableOfContents';
 import { noopToken } from '../util/cancellation';
 import { InMemoryDocument } from '../util/inMemoryDocument';
-import { MdWorkspaceContents } from '../workspaceContents';
+import { IMdWorkspace } from '../workspace';
 import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { InMemoryMdWorkspace } from './inMemoryWorkspace';
 import { nulLogger } from './nulLogging';
 import { assertRangeEqual, joinLines, workspacePath } from './util';
 
@@ -22,7 +22,7 @@ import { assertRangeEqual, joinLines, workspacePath } from './util';
 /**
  * Get prepare rename info.
  */
-function prepareRename(doc: InMemoryDocument, pos: vscode.Position, workspace: MdWorkspaceContents): Promise<undefined | { readonly range: vscode.Range; readonly placeholder: string }> {
+function prepareRename(doc: InMemoryDocument, pos: vscode.Position, workspace: IMdWorkspace): Promise<undefined | { readonly range: vscode.Range; readonly placeholder: string }> {
 	const engine = createNewMarkdownEngine();
 	const referenceComputer = new MdReferencesProvider(engine, workspace, new MdTableOfContentsProvider(engine, workspace, nulLogger), nulLogger);
 	const renameProvider = new MdVsCodeRenameProvider(workspace, referenceComputer, githubSlugifier);
@@ -32,7 +32,7 @@ function prepareRename(doc: InMemoryDocument, pos: vscode.Position, workspace: M
 /**
  * Get all the edits for the rename.
  */
-function getRenameEdits(doc: InMemoryDocument, pos: vscode.Position, newName: string, workspace: MdWorkspaceContents): Promise<MdWorkspaceEdit | undefined> {
+function getRenameEdits(doc: InMemoryDocument, pos: vscode.Position, newName: string, workspace: IMdWorkspace): Promise<MdWorkspaceEdit | undefined> {
 	const engine = createNewMarkdownEngine();
 	const referencesProvider = new MdReferencesProvider(engine, workspace, new MdTableOfContentsProvider(engine, workspace, nulLogger), nulLogger);
 	const renameProvider = new MdVsCodeRenameProvider(workspace, referencesProvider, githubSlugifier);
@@ -97,10 +97,10 @@ suite('markdown: rename', () => {
 			`# abc`
 		));
 
-		const info = await prepareRename(doc, new vscode.Position(0, 0), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const info = await prepareRename(doc, new vscode.Position(0, 0), new InMemoryMdWorkspace([doc]));
 		assertRangeEqual(info!.range, new vscode.Range(0, 2, 0, 5));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryMdWorkspace([doc]));
 		assertEditsEqual(edit!, {
 			uri, edits: [
 				new vscode.TextEdit(new vscode.Range(0, 2, 0, 5), 'New Header')
@@ -114,10 +114,10 @@ suite('markdown: rename', () => {
 			`### abc ###`
 		));
 
-		const info = await prepareRename(doc, new vscode.Position(0, 0), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const info = await prepareRename(doc, new vscode.Position(0, 0), new InMemoryMdWorkspace([doc]));
 		assertRangeEqual(info!.range, new vscode.Range(0, 4, 0, 7));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryMdWorkspace([doc]));
 		assertEditsEqual(edit!, {
 			uri, edits: [
 				new vscode.TextEdit(new vscode.Range(0, 4, 0, 7), 'New Header')
@@ -132,7 +132,7 @@ suite('markdown: rename', () => {
 			`[text](#a-b-c)`,
 		));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryMdWorkspace([doc]));
 		assertEditsEqual(edit!, {
 			uri, edits: [
 				new vscode.TextEdit(new vscode.Range(0, 4, 0, 9), 'New Header'),
@@ -148,7 +148,7 @@ suite('markdown: rename', () => {
 			`[text](#a-b-c)`, // rename here
 		));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(1, 10), "New Header", new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const edit = await getRenameEdits(doc, new vscode.Position(1, 10), "New Header", new InMemoryMdWorkspace([doc]));
 		assertEditsEqual(edit!, {
 			uri, edits: [
 				new vscode.TextEdit(new vscode.Range(0, 4, 0, 9), 'New Header'),
@@ -165,7 +165,7 @@ suite('markdown: rename', () => {
 			`[ref]: #a-b-c`// rename here
 		));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(2, 10), "New Header", new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const edit = await getRenameEdits(doc, new vscode.Position(2, 10), "New Header", new InMemoryMdWorkspace([doc]));
 		assertEditsEqual(edit!, {
 			uri, edits: [
 				new vscode.TextEdit(new vscode.Range(0, 4, 0, 9), 'New Header'),
@@ -183,7 +183,7 @@ suite('markdown: rename', () => {
 			`[text](#a-b-c)`,
 		));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryWorkspaceMarkdownDocuments([
+		const edit = await getRenameEdits(doc, new vscode.Position(0, 0), "New Header", new InMemoryMdWorkspace([
 			doc,
 			new InMemoryDocument(otherUri, joinLines(
 				`[text](#a-b-c)`, // Should not find this
@@ -212,7 +212,7 @@ suite('markdown: rename', () => {
 			`[text](#a-b-c)`,  // rename here
 		));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(1, 10), "New Header", new InMemoryWorkspaceMarkdownDocuments([
+		const edit = await getRenameEdits(doc, new vscode.Position(1, 10), "New Header", new InMemoryMdWorkspace([
 			doc,
 			new InMemoryDocument(otherUri, joinLines(
 				`[text](#a-b-c)`, // Should not find this
@@ -263,7 +263,7 @@ suite('markdown: rename', () => {
 
 		{
 			// Rename on header with file extension
-			const edit = await getRenameEdits(otherDoc, new vscode.Position(1, 17), "New Header", new InMemoryWorkspaceMarkdownDocuments([
+			const edit = await getRenameEdits(otherDoc, new vscode.Position(1, 17), "New Header", new InMemoryMdWorkspace([
 				doc,
 				otherDoc
 			]));
@@ -271,7 +271,7 @@ suite('markdown: rename', () => {
 		}
 		{
 			// Rename on header without extension
-			const edit = await getRenameEdits(otherDoc, new vscode.Position(2, 15), "New Header", new InMemoryWorkspaceMarkdownDocuments([
+			const edit = await getRenameEdits(otherDoc, new vscode.Position(2, 15), "New Header", new InMemoryMdWorkspace([
 				doc,
 				otherDoc
 			]));
@@ -288,7 +288,7 @@ suite('markdown: rename', () => {
 			`[ref]: https://example.com`,
 		));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 8), "new ref", new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const edit = await getRenameEdits(doc, new vscode.Position(0, 8), "new ref", new InMemoryMdWorkspace([doc]));
 		assertEditsEqual(edit!, {
 			uri, edits: [
 				new vscode.TextEdit(new vscode.Range(0, 7, 0, 10), 'new ref'),
@@ -307,7 +307,7 @@ suite('markdown: rename', () => {
 			`[ref]: https://example.com`, // rename here
 		));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(3, 3), "new ref", new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const edit = await getRenameEdits(doc, new vscode.Position(3, 3), "new ref", new InMemoryMdWorkspace([doc]));
 		assertEditsEqual(edit!, {
 			uri, edits: [
 				new vscode.TextEdit(new vscode.Range(0, 7, 0, 10), 'new ref'),
@@ -326,11 +326,11 @@ suite('markdown: rename', () => {
 			`[ref]: #a-b-c`, // rename here
 		));
 
-		const preparedInfo = await prepareRename(doc, new vscode.Position(3, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const preparedInfo = await prepareRename(doc, new vscode.Position(3, 10), new InMemoryMdWorkspace([doc]));
 		assert.strictEqual(preparedInfo!.placeholder, 'a B c');
 		assertRangeEqual(preparedInfo!.range, new vscode.Range(3, 8, 3, 13));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(3, 10), "x Y z", new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const edit = await getRenameEdits(doc, new vscode.Position(3, 10), "x Y z", new InMemoryMdWorkspace([doc]));
 		assertEditsEqual(edit!, {
 			uri, edits: [
 				new vscode.TextEdit(new vscode.Range(0, 2, 0, 7), 'x Y z'),
@@ -347,7 +347,7 @@ suite('markdown: rename', () => {
 			`[text](#header)`,
 		));
 
-		await assert.rejects(prepareRename(doc, new vscode.Position(1, 2), new InMemoryWorkspaceMarkdownDocuments([doc])));
+		await assert.rejects(prepareRename(doc, new vscode.Position(1, 2), new InMemoryMdWorkspace([doc])));
 	});
 
 	test('Path rename should use file path as range', async () => {
@@ -357,7 +357,7 @@ suite('markdown: rename', () => {
 			`[ref]: ./doc.md`,
 		));
 
-		const info = await prepareRename(doc, new vscode.Position(0, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const info = await prepareRename(doc, new vscode.Position(0, 10), new InMemoryMdWorkspace([doc]));
 		assert.strictEqual(info!.placeholder, './doc.md');
 		assertRangeEqual(info!.range, new vscode.Range(0, 7, 0, 15));
 	});
@@ -369,7 +369,7 @@ suite('markdown: rename', () => {
 			`[ref]: ./doc.md#some-header`,
 		));
 
-		const info = await prepareRename(doc, new vscode.Position(0, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const info = await prepareRename(doc, new vscode.Position(0, 10), new InMemoryMdWorkspace([doc]));
 		assert.strictEqual(info!.placeholder, './doc.md');
 		assertRangeEqual(info!.range, new vscode.Range(0, 7, 0, 15));
 	});
@@ -381,7 +381,7 @@ suite('markdown: rename', () => {
 			`[ref]: ./doc.md`,
 		));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 10), './sub/newDoc.md', new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const edit = await getRenameEdits(doc, new vscode.Position(0, 10), './sub/newDoc.md', new InMemoryMdWorkspace([doc]));
 		assertEditsEqual(edit!, {
 			originalUri: uri,
 			newUri: workspacePath('sub', 'newDoc.md'),
@@ -400,7 +400,7 @@ suite('markdown: rename', () => {
 			`[ref]: /sub/doc.md`,
 		));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 10), '/newSub/newDoc.md', new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const edit = await getRenameEdits(doc, new vscode.Position(0, 10), '/newSub/newDoc.md', new InMemoryMdWorkspace([doc]));
 		assertEditsEqual(edit!, {
 			originalUri: uri,
 			newUri: workspacePath('newSub', 'newDoc.md'),
@@ -418,7 +418,7 @@ suite('markdown: rename', () => {
 			`[text](/sub/doc%20with%20spaces.md)`,
 		));
 
-		const info = await prepareRename(doc, new vscode.Position(0, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const info = await prepareRename(doc, new vscode.Position(0, 10), new InMemoryMdWorkspace([doc]));
 		assert.strictEqual(info!.placeholder, '/sub/doc with spaces.md');
 	});
 
@@ -429,7 +429,7 @@ suite('markdown: rename', () => {
 			`[ref]: /sub/doc.md`,
 		));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 10), '/NEW sub/new DOC.md', new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const edit = await getRenameEdits(doc, new vscode.Position(0, 10), '/NEW sub/new DOC.md', new InMemoryMdWorkspace([doc]));
 		assertEditsEqual(edit!, {
 			originalUri: uri,
 			newUri: workspacePath('NEW sub', 'new DOC.md'),
@@ -454,7 +454,7 @@ suite('markdown: rename', () => {
 			`![img](/images/more/image.png)`,
 		));
 
-		const edit = await getRenameEdits(doc1, new vscode.Position(0, 10), '/img/test/new.png', new InMemoryWorkspaceMarkdownDocuments([
+		const edit = await getRenameEdits(doc1, new vscode.Position(0, 10), '/img/test/new.png', new InMemoryMdWorkspace([
 			doc1,
 			doc2
 		]));
@@ -480,7 +480,7 @@ suite('markdown: rename', () => {
 			`[ref]: /doc#other`,
 		));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(0, 10), '/new File', new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const edit = await getRenameEdits(doc, new vscode.Position(0, 10), '/new File', new InMemoryMdWorkspace([doc]));
 		assertEditsEqual(edit!, {
 			originalUri: uri,
 			newUri: workspacePath('new File.md'), // Rename on disk should use file extension
@@ -518,7 +518,7 @@ suite('markdown: rename', () => {
 			`[ref]: /sub/doc.md`,
 		));
 
-		const edit = await getRenameEdits(doc1, new vscode.Position(0, 10), './new/new-doc.md', new InMemoryWorkspaceMarkdownDocuments([
+		const edit = await getRenameEdits(doc1, new vscode.Position(0, 10), './new/new-doc.md', new InMemoryMdWorkspace([
 			doc1, doc2, doc3, doc4,
 		]));
 		assertEditsEqual(edit!, {
@@ -561,7 +561,7 @@ suite('markdown: rename', () => {
 		const uri3 = workspacePath('sub', 'sub2', 'doc3.md');
 		const doc3 = new InMemoryDocument(uri3, joinLines());
 
-		const edit = await getRenameEdits(doc1, new vscode.Position(0, 10), 'sub2/cat.md', new InMemoryWorkspaceMarkdownDocuments([
+		const edit = await getRenameEdits(doc1, new vscode.Position(0, 10), 'sub2/cat.md', new InMemoryMdWorkspace([
 			doc1, doc2, doc3
 		]));
 		assertEditsEqual(edit!, {
@@ -581,7 +581,7 @@ suite('markdown: rename', () => {
 			`[text](#a-b-c)`,
 		));
 
-		const info = await prepareRename(doc, new vscode.Position(1, 10), new InMemoryWorkspaceMarkdownDocuments([doc]));
+		const info = await prepareRename(doc, new vscode.Position(1, 10), new InMemoryMdWorkspace([doc]));
 		assert.strictEqual(info!.placeholder, 'a B c');
 		assertRangeEqual(info!.range, new vscode.Range(1, 8, 1, 13));
 	});
@@ -595,7 +595,7 @@ suite('markdown: rename', () => {
 			`<http://example.com>`,
 		));
 
-		const edit = await getRenameEdits(doc, new vscode.Position(1, 10), "https://example.com/sub", new InMemoryWorkspaceMarkdownDocuments([
+		const edit = await getRenameEdits(doc, new vscode.Position(1, 10), "https://example.com/sub", new InMemoryMdWorkspace([
 			doc,
 			new InMemoryDocument(uri2, joinLines(
 				`[4](http://example.com)`,
@@ -622,7 +622,7 @@ suite('markdown: rename', () => {
 			`[ref]: /file`, // rename here
 		));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc]);
+		const workspace = new InMemoryMdWorkspace([doc]);
 
 		const preparedInfo = await prepareRename(doc, new vscode.Position(2, 10), workspace);
 		assert.strictEqual(preparedInfo!.placeholder, '/file');
@@ -648,7 +648,7 @@ suite('markdown: rename', () => {
 		const uri2 = workspacePath('doc2.md');
 		const doc2 = new InMemoryDocument(uri2, joinLines());
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]);
+		const workspace = new InMemoryMdWorkspace([doc1, doc2]);
 
 		const preparedInfo = await prepareRename(doc1, new vscode.Position(2, 10), workspace);
 		assert.strictEqual(preparedInfo!.placeholder, '/doc2');
@@ -674,7 +674,7 @@ suite('markdown: rename', () => {
 			`[ref]: /file#header`, // rename here
 		));
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([doc]);
+		const workspace = new InMemoryMdWorkspace([doc]);
 
 		const preparedInfo = await prepareRename(doc, new vscode.Position(2, 16), workspace);
 		assert.strictEqual(preparedInfo!.placeholder, 'header');

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

@@ -9,7 +9,7 @@ import { MdSmartSelect } from '../languageFeatures/smartSelect';
 import { MdTableOfContentsProvider } from '../tableOfContents';
 import { InMemoryDocument } from '../util/inMemoryDocument';
 import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { InMemoryMdWorkspace } from './inMemoryWorkspace';
 import { nulLogger } from './nulLogging';
 import { CURSOR, getCursorPositions, joinLines } from './util';
 
@@ -723,7 +723,7 @@ function assertLineNumbersEqual(selectionRange: vscode.SelectionRange, startLine
 
 function getSelectionRangesForDocument(contents: string, pos?: vscode.Position[]): Promise<vscode.SelectionRange[] | undefined> {
 	const doc = new InMemoryDocument(testFileName, contents);
-	const workspace = new InMemoryWorkspaceMarkdownDocuments([doc]);
+	const workspace = new InMemoryMdWorkspace([doc]);
 	const engine = createNewMarkdownEngine();
 	const provider = new MdSmartSelect(engine, new MdTableOfContentsProvider(engine, workspace, nulLogger));
 	const positions = pos ? pos : getCursorPositions(contents, doc);

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

@@ -7,14 +7,14 @@ import * as assert from 'assert';
 import 'mocha';
 import * as vscode from 'vscode';
 import { TableOfContents } from '../tableOfContents';
+import { ITextDocument } from '../types/textDocument';
 import { InMemoryDocument } from '../util/inMemoryDocument';
-import { SkinnyTextDocument } from '../workspaceContents';
 import { createNewMarkdownEngine } from './engine';
 
 
 const testFileName = vscode.Uri.file('test.md');
 
-function createToc(doc: SkinnyTextDocument): Promise<TableOfContents> {
+function createToc(doc: ITextDocument): Promise<TableOfContents> {
 	const engine = createNewMarkdownEngine();
 	return TableOfContents.create(engine, doc);
 }

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

@@ -9,14 +9,15 @@ import * as vscode from 'vscode';
 import { MdDocumentSymbolProvider } from '../languageFeatures/documentSymbols';
 import { MdWorkspaceSymbolProvider } from '../languageFeatures/workspaceSymbols';
 import { MdTableOfContentsProvider } from '../tableOfContents';
+import { ITextDocument } from '../types/textDocument';
 import { InMemoryDocument } from '../util/inMemoryDocument';
-import { MdWorkspaceContents, SkinnyTextDocument } from '../workspaceContents';
+import { IMdWorkspace } from '../workspace';
 import { createNewMarkdownEngine } from './engine';
-import { InMemoryWorkspaceMarkdownDocuments } from './inMemoryWorkspace';
+import { InMemoryMdWorkspace } from './inMemoryWorkspace';
 import { nulLogger } from './nulLogging';
 import { workspacePath } from './util';
 
-function getWorkspaceSymbols(workspace: MdWorkspaceContents, query = ''): Promise<vscode.SymbolInformation[]> {
+function getWorkspaceSymbols(workspace: IMdWorkspace, query = ''): Promise<vscode.SymbolInformation[]> {
 	const engine = createNewMarkdownEngine();
 	const symbolProvider = new MdDocumentSymbolProvider(new MdTableOfContentsProvider(engine, workspace, nulLogger), nulLogger);
 	return new MdWorkspaceSymbolProvider(symbolProvider, workspace).provideWorkspaceSymbols(query);
@@ -24,12 +25,12 @@ function getWorkspaceSymbols(workspace: MdWorkspaceContents, query = ''): Promis
 
 suite('markdown.WorkspaceSymbolProvider', () => {
 	test('Should not return anything for empty workspace', async () => {
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([]);
+		const workspace = new InMemoryMdWorkspace([]);
 		assert.deepStrictEqual(await getWorkspaceSymbols(workspace, ''), []);
 	});
 
 	test('Should return symbols from workspace with one markdown file', async () => {
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([
+		const workspace = new InMemoryMdWorkspace([
 			new InMemoryDocument(workspacePath('test.md'), `# header1\nabc\n## header2`)
 		]);
 
@@ -41,13 +42,13 @@ suite('markdown.WorkspaceSymbolProvider', () => {
 
 	test('Should return all content  basic workspace', async () => {
 		const fileNameCount = 10;
-		const files: SkinnyTextDocument[] = [];
+		const files: ITextDocument[] = [];
 		for (let i = 0; i < fileNameCount; ++i) {
 			const testFileName = workspacePath(`test${i}.md`);
 			files.push(new InMemoryDocument(testFileName, `# common\nabc\n## header${i}`));
 		}
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments(files);
+		const workspace = new InMemoryMdWorkspace(files);
 
 		const symbols = await getWorkspaceSymbols(workspace, '');
 		assert.strictEqual(symbols.length, fileNameCount * 2);
@@ -55,7 +56,7 @@ suite('markdown.WorkspaceSymbolProvider', () => {
 
 	test('Should update results when markdown file changes symbols', async () => {
 		const testFileName = workspacePath('test.md');
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([
+		const workspace = new InMemoryMdWorkspace([
 			new InMemoryDocument(testFileName, `# header1`, 1 /* version */)
 		]);
 
@@ -72,7 +73,7 @@ suite('markdown.WorkspaceSymbolProvider', () => {
 	test('Should remove results when file is deleted', async () => {
 		const testFileName = workspacePath('test.md');
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([
+		const workspace = new InMemoryMdWorkspace([
 			new InMemoryDocument(testFileName, `# header1`)
 		]);
 
@@ -87,7 +88,7 @@ suite('markdown.WorkspaceSymbolProvider', () => {
 	test('Should update results when markdown file is created', async () => {
 		const testFileName = workspacePath('test.md');
 
-		const workspace = new InMemoryWorkspaceMarkdownDocuments([
+		const workspace = new InMemoryMdWorkspace([
 			new InMemoryDocument(testFileName, `# header1`)
 		]);