Merge commit 'be3e8236086165e5e45a5a10783823874b3f3ebd' as 'lib/vscode'

lib/vscode/src/vs/base/test/browser/markdownRenderer.test.ts

@@ -0,0 +1,118 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import * as marked from 'vs/base/common/marked/marked';
+import { renderMarkdown } from 'vs/base/browser/markdownRenderer';
+import { MarkdownString, IMarkdownString } from 'vs/base/common/htmlContent';
+import { URI } from 'vs/base/common/uri';
+import { parse } from 'vs/base/common/marshalling';
+
+suite('MarkdownRenderer', () => {
+	suite('Images', () => {
+
+		test('image rendering conforms to default', () => {
+			const markdown = { value: `![image](someimageurl 'caption')` };
+			const result: HTMLElement = renderMarkdown(markdown);
+			const renderer = new marked.Renderer();
+			const imageFromMarked = marked(markdown.value, {
+				renderer
+			}).trim();
+			assert.strictEqual(result.innerHTML, imageFromMarked);
+		});
+
+		test('image rendering conforms to default without title', () => {
+			const markdown = { value: `![image](someimageurl)` };
+			const result: HTMLElement = renderMarkdown(markdown);
+			const renderer = new marked.Renderer();
+			const imageFromMarked = marked(markdown.value, {
+				renderer
+			}).trim();
+			assert.strictEqual(result.innerHTML, imageFromMarked);
+		});
+
+		test('image width from title params', () => {
+			let result: HTMLElement = renderMarkdown({ value: `![image](someimageurl|width=100 'caption')` });
+			assert.strictEqual(result.innerHTML, `<p><img src="someimageurl" alt="image" title="caption" width="100"></p>`);
+		});
+
+		test('image height from title params', () => {
+			let result: HTMLElement = renderMarkdown({ value: `![image](someimageurl|height=100 'caption')` });
+			assert.strictEqual(result.innerHTML, `<p><img src="someimageurl" alt="image" title="caption" height="100"></p>`);
+		});
+
+		test('image width and height from title params', () => {
+			let result: HTMLElement = renderMarkdown({ value: `![image](someimageurl|height=200,width=100 'caption')` });
+			assert.strictEqual(result.innerHTML, `<p><img src="someimageurl" alt="image" title="caption" width="100" height="200"></p>`);
+		});
+
+	});
+
+	suite('ThemeIcons Support On', () => {
+
+		test('render appendText', () => {
+			const mds = new MarkdownString(undefined, { supportThemeIcons: true });
+			mds.appendText('$(zap) $(not a theme icon) $(add)');
+
+			let result: HTMLElement = renderMarkdown(mds);
+			assert.strictEqual(result.innerHTML, `<p>$(zap) $(not a theme icon) $(add)</p>`);
+		});
+
+		test('render appendMarkdown', () => {
+			const mds = new MarkdownString(undefined, { supportThemeIcons: true });
+			mds.appendMarkdown('$(zap) $(not a theme icon) $(add)');
+
+			let result: HTMLElement = renderMarkdown(mds);
+			assert.strictEqual(result.innerHTML, `<p><span class="codicon codicon-zap"></span> $(not a theme icon) <span class="codicon codicon-add"></span></p>`);
+		});
+
+		test('render appendMarkdown with escaped icon', () => {
+			const mds = new MarkdownString(undefined, { supportThemeIcons: true });
+			mds.appendMarkdown('\\$(zap) $(not a theme icon) $(add)');
+
+			let result: HTMLElement = renderMarkdown(mds);
+			assert.strictEqual(result.innerHTML, `<p>$(zap) $(not a theme icon) <span class="codicon codicon-add"></span></p>`);
+		});
+
+	});
+
+	suite('ThemeIcons Support Off', () => {
+
+		test('render appendText', () => {
+			const mds = new MarkdownString(undefined, { supportThemeIcons: false });
+			mds.appendText('$(zap) $(not a theme icon) $(add)');
+
+			let result: HTMLElement = renderMarkdown(mds);
+			assert.strictEqual(result.innerHTML, `<p>$(zap) $(not a theme icon) $(add)</p>`);
+		});
+
+		test('render appendMarkdown with escaped icon', () => {
+			const mds = new MarkdownString(undefined, { supportThemeIcons: false });
+			mds.appendMarkdown('\\$(zap) $(not a theme icon) $(add)');
+
+			let result: HTMLElement = renderMarkdown(mds);
+			assert.strictEqual(result.innerHTML, `<p>$(zap) $(not a theme icon) $(add)</p>`);
+		});
+
+	});
+
+	test('npm Hover Run Script not working #90855', function () {
+
+		const md: IMarkdownString = JSON.parse('{"value":"[Run Script](command:npm.runScriptFromHover?%7B%22documentUri%22%3A%7B%22%24mid%22%3A1%2C%22fsPath%22%3A%22c%3A%5C%5CUsers%5C%5Cjrieken%5C%5CCode%5C%5C_sample%5C%5Cfoo%5C%5Cpackage.json%22%2C%22_sep%22%3A1%2C%22external%22%3A%22file%3A%2F%2F%2Fc%253A%2FUsers%2Fjrieken%2FCode%2F_sample%2Ffoo%2Fpackage.json%22%2C%22path%22%3A%22%2Fc%3A%2FUsers%2Fjrieken%2FCode%2F_sample%2Ffoo%2Fpackage.json%22%2C%22scheme%22%3A%22file%22%7D%2C%22script%22%3A%22echo%22%7D \\"Run the script as a task\\")","supportThemeIcons":false,"isTrusted":true,"uris":{"__uri_e49443":{"$mid":1,"fsPath":"c:\\\\Users\\\\jrieken\\\\Code\\\\_sample\\\\foo\\\\package.json","_sep":1,"external":"file:///c%3A/Users/jrieken/Code/_sample/foo/package.json","path":"/c:/Users/jrieken/Code/_sample/foo/package.json","scheme":"file"},"command:npm.runScriptFromHover?%7B%22documentUri%22%3A%7B%22%24mid%22%3A1%2C%22fsPath%22%3A%22c%3A%5C%5CUsers%5C%5Cjrieken%5C%5CCode%5C%5C_sample%5C%5Cfoo%5C%5Cpackage.json%22%2C%22_sep%22%3A1%2C%22external%22%3A%22file%3A%2F%2F%2Fc%253A%2FUsers%2Fjrieken%2FCode%2F_sample%2Ffoo%2Fpackage.json%22%2C%22path%22%3A%22%2Fc%3A%2FUsers%2Fjrieken%2FCode%2F_sample%2Ffoo%2Fpackage.json%22%2C%22scheme%22%3A%22file%22%7D%2C%22script%22%3A%22echo%22%7D":{"$mid":1,"path":"npm.runScriptFromHover","scheme":"command","query":"{\\"documentUri\\":\\"__uri_e49443\\",\\"script\\":\\"echo\\"}"}}}');
+		const element = renderMarkdown(md);
+
+		const anchor = element.querySelector('a')!;
+		assert.ok(anchor);
+		assert.ok(anchor.dataset['href']);
+
+		const uri = URI.parse(anchor.dataset['href']!);
+
+		const data = <{ script: string, documentUri: URI }>parse(decodeURIComponent(uri.query));
+		assert.ok(data);
+		assert.equal(data.script, 'echo');
+		assert.ok(data.documentUri.toString().startsWith('file:///c%3A/'));
+	});
+
+});