mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-24 02:28:34 +01:00
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`
This commit is contained in:
@@ -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`)
|
||||
]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user