From c8ac8ec30096bdabf1041fd0bdf271d02e3ed4ab Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 10 Aug 2018 12:10:23 +0200 Subject: [PATCH] debt - towards scheme-enforcement, #56108 --- .../src/test/documentLinkProvider.test.ts | 2 +- .../src/test/documentSymbolProvider.test.ts | 2 +- .../src/test/foldingProvider.test.ts | 2 +- .../src/test/tableOfContentsProvider.test.ts | 2 +- .../src/test/workspaceSymbolProvider.test.ts | 12 ++++++------ src/vs/workbench/browser/parts/views/customView.ts | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/extensions/markdown-language-features/src/test/documentLinkProvider.test.ts b/extensions/markdown-language-features/src/test/documentLinkProvider.test.ts index 910ed3c9bdf..5a1d0c87880 100644 --- a/extensions/markdown-language-features/src/test/documentLinkProvider.test.ts +++ b/extensions/markdown-language-features/src/test/documentLinkProvider.test.ts @@ -10,7 +10,7 @@ import LinkProvider from '../features/documentLinkProvider'; import { InMemoryDocument } from './inMemoryDocument'; -const testFileName = vscode.Uri.parse('test.md'); +const testFileName = vscode.Uri.file('test.md'); const noopToken = new class implements vscode.CancellationToken { private _onCancellationRequestedEmitter = new vscode.EventEmitter(); diff --git a/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts b/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts index b87b5cf2ea4..9533f807cf9 100644 --- a/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts +++ b/extensions/markdown-language-features/src/test/documentSymbolProvider.test.ts @@ -11,7 +11,7 @@ import { InMemoryDocument } from './inMemoryDocument'; import { createNewMarkdownEngine } from './engine'; -const testFileName = vscode.Uri.parse('test.md'); +const testFileName = vscode.Uri.file('test.md'); function getSymbolsForFile(fileContents: string) { diff --git a/extensions/markdown-language-features/src/test/foldingProvider.test.ts b/extensions/markdown-language-features/src/test/foldingProvider.test.ts index cd3b82d599e..6489694db46 100644 --- a/extensions/markdown-language-features/src/test/foldingProvider.test.ts +++ b/extensions/markdown-language-features/src/test/foldingProvider.test.ts @@ -11,7 +11,7 @@ import MarkdownFoldingProvider from '../features/foldingProvider'; import { InMemoryDocument } from './inMemoryDocument'; import { createNewMarkdownEngine } from './engine'; -const testFileName = vscode.Uri.parse('test.md'); +const testFileName = vscode.Uri.file('test.md'); suite('markdown.FoldingProvider', () => { test('Should not return anything for empty document', async () => { diff --git a/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts b/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts index 6d6f382ae7e..ee103b294ca 100644 --- a/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts +++ b/extensions/markdown-language-features/src/test/tableOfContentsProvider.test.ts @@ -11,7 +11,7 @@ import { TableOfContentsProvider } from '../tableOfContentsProvider'; import { InMemoryDocument } from './inMemoryDocument'; import { createNewMarkdownEngine } from './engine'; -const testFileName = vscode.Uri.parse('test.md'); +const testFileName = vscode.Uri.file('test.md'); suite('markdown.TableOfContentsProvider', () => { test('Lookup should not return anything for empty document', async () => { diff --git a/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts b/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts index 2ee12a7979c..f5b3eb0ea4a 100644 --- a/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts +++ b/extensions/markdown-language-features/src/test/workspaceSymbolProvider.test.ts @@ -22,7 +22,7 @@ suite('markdown.WorkspaceSymbolProvider', () => { }); test('Should return symbols from workspace with one markdown file', async () => { - const testFileName = vscode.Uri.parse('test.md'); + const testFileName = vscode.Uri.file('test.md'); const provider = new MarkdownWorkspaceSymbolProvider(symbolProvider, new InMemoryWorkspaceMarkdownDocumentProvider([ new InMemoryDocument(testFileName, `# header1\nabc\n## header2`) @@ -49,7 +49,7 @@ suite('markdown.WorkspaceSymbolProvider', () => { }); test('Should update results when markdown file changes symbols', async () => { - const testFileName = vscode.Uri.parse('test.md'); + const testFileName = vscode.Uri.file('test.md'); const workspaceFileProvider = new InMemoryWorkspaceMarkdownDocumentProvider([ new InMemoryDocument(testFileName, `# header1`) @@ -68,7 +68,7 @@ suite('markdown.WorkspaceSymbolProvider', () => { }); test('Should remove results when file is deleted', async () => { - const testFileName = vscode.Uri.parse('test.md'); + const testFileName = vscode.Uri.file('test.md'); const workspaceFileProvider = new InMemoryWorkspaceMarkdownDocumentProvider([ new InMemoryDocument(testFileName, `# header1`) @@ -84,7 +84,7 @@ suite('markdown.WorkspaceSymbolProvider', () => { }); test('Should update results when markdown file is created', async () => { - const testFileName = vscode.Uri.parse('test.md'); + const testFileName = vscode.Uri.file('test.md'); const workspaceFileProvider = new InMemoryWorkspaceMarkdownDocumentProvider([ new InMemoryDocument(testFileName, `# header1`) @@ -94,7 +94,7 @@ suite('markdown.WorkspaceSymbolProvider', () => { assert.strictEqual((await provider.provideWorkspaceSymbols('')).length, 1); // Creat file - workspaceFileProvider.createDocument(new InMemoryDocument(vscode.Uri.parse('test2.md'), `# new header\nabc\n## header2`)); + workspaceFileProvider.createDocument(new InMemoryDocument(vscode.Uri.file('test2.md'), `# new header\nabc\n## header2`)); const newSymbols = await provider.provideWorkspaceSymbols(''); assert.strictEqual(newSymbols.length, 3); }); @@ -105,7 +105,7 @@ class InMemoryWorkspaceMarkdownDocumentProvider implements WorkspaceMarkdownDocu private readonly _documents = new Map(); constructor(documents: vscode.TextDocument[]) { - for( const doc of documents) { + for (const doc of documents) { this._documents.set(doc.fileName, doc); } } diff --git a/src/vs/workbench/browser/parts/views/customView.ts b/src/vs/workbench/browser/parts/views/customView.ts index bf04ef7a0c0..b79fd81f196 100644 --- a/src/vs/workbench/browser/parts/views/customView.ts +++ b/src/vs/workbench/browser/parts/views/customView.ts @@ -504,7 +504,7 @@ class TreeRenderer implements IRenderer { if ((resource || node.themeIcon) && !icon) { const fileDecorations = this.configurationService.getValue<{ colors: boolean, badges: boolean }>('explorer.decorations'); - templateData.resourceLabel.setLabel({ name: label, resource: resource ? resource : URI.parse('_icon_resource') }, { fileKind: this.getFileKind(node), title, fileDecorations: fileDecorations, extraClasses: ['custom-view-tree-node-item-resourceLabel'] }); + templateData.resourceLabel.setLabel({ name: label, resource: resource ? resource : URI.parse('missing:_icon_resource') }, { fileKind: this.getFileKind(node), title, fileDecorations: fileDecorations, extraClasses: ['custom-view-tree-node-item-resourceLabel'] }); } else { templateData.resourceLabel.setLabel({ name: label }, { title, hideIcon: true, extraClasses: ['custom-view-tree-node-item-resourceLabel'] }); }