Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)

extensions/markdown-math/.gitignore

@@ -0,0 +1 @@
+notebook-out

extensions/markdown-math/.vscodeignore

@@ -0,0 +1,5 @@
+notebook/**
+extension-browser.webpack.config.js
+cgmanifest.json
+yarn.lock
+webpack.config.js

extensions/markdown-math/README.md

@@ -0,0 +1,3 @@
+# Markdown Math support
+
+**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.

extensions/markdown-math/esbuild.js

@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const path = require('path');
+const fse = require('fs-extra');
+const esbuild = require('esbuild');
+
+const args = process.argv.slice(2);
+
+const isWatch = args.indexOf('--watch') >= 0;
+
+let outputRoot = __dirname;
+const outputRootIndex = args.indexOf('--outputRoot');
+if (outputRootIndex >= 0) {
+	outputRoot = args[outputRootIndex + 1];
+}
+
+const outDir = path.join(outputRoot, 'notebook-out');
+esbuild.build({
+	entryPoints: [
+		path.join(__dirname, 'notebook', 'katex.ts'),
+	],
+	bundle: true,
+	minify: true,
+	sourcemap: false,
+	format: 'esm',
+	outdir: outDir,
+	platform: 'browser',
+	target: ['es2020'],
+	incremental: isWatch,
+}).catch(() => process.exit(1));
+
+fse.copySync(
+	path.join(__dirname, 'node_modules/katex/dist/katex.min.css'),
+	path.join(outDir, 'katex.min.css'));
+
+fse.copySync(
+	path.join(__dirname, 'node_modules/katex/dist/fonts'),
+	path.join(outDir, 'fonts/'));

extensions/markdown-math/extension-browser.webpack.config.js

@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withBrowserDefaults = require('../shared.webpack.config').browser;
+
+module.exports = withBrowserDefaults({
+	context: __dirname,
+	entry: {
+		extension: './src/extension.ts'
+	}
+});

extensions/markdown-math/extension.webpack.config.js

@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+
+module.exports = withDefaults({
+	context: __dirname,
+	resolve: {
+		mainFields: ['module', 'main']
+	},
+	entry: {
+		extension: './src/extension.ts',
+	}
+});

extensions/markdown-math/notebook/katex.ts

@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type * as markdownIt from 'markdown-it';
+
+const styleHref = import.meta.url.replace(/katex.js$/, 'katex.min.css');
+
+export async function activate(ctx: {
+	getRenderer: (id: string) => Promise<any | undefined>
+}) {
+	const markdownItRenderer = await ctx.getRenderer('markdownItRenderer');
+	if (!markdownItRenderer) {
+		throw new Error('Could not load markdownItRenderer');
+	}
+
+	const link = document.createElement('link');
+	link.rel = 'stylesheet';
+	link.classList.add('markdown-style');
+	link.href = styleHref;
+	document.head.append(link);
+
+	const style = document.createElement('style');
+	style.classList.add('markdown-style');
+	style.textContent = `
+		.katex-error {
+			color: var(--vscode-editorError-foreground);
+		}
+	`;
+	document.head.append(style);
+
+	const katex = require('@iktakahiro/markdown-it-katex');
+	markdownItRenderer.extendMarkdownIt((md: markdownIt.MarkdownIt) => {
+		return md.use(katex);
+	});
+}

extensions/markdown-math/notebook/tsconfig.json

@@ -0,0 +1,13 @@
+{
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"outDir": "./dist/",
+		"jsx": "react",
+		"module": "es2020",
+		"lib": [
+			"es2018",
+			"DOM",
+			"DOM.Iterable"
+		]
+	}
+}

extensions/markdown-math/package.json

@@ -0,0 +1,69 @@
+{
+  "name": "markdown-math",
+  "displayName": "%displayName%",
+  "description": "%description%",
+  "version": "1.0.0",
+  "icon": "icon.png",
+  "publisher": "vscode",
+  "license": "MIT",
+  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
+  "engines": {
+    "vscode": "^1.54.0"
+  },
+  "categories": [
+    "Other"
+  ],
+  "capabilities": {
+    "virtualWorkspaces": true,
+    "untrustedWorkspaces": {
+      "supported": true
+    }
+  },
+  "main": "./out/extension",
+  "browser": "./dist/browser/extension",
+  "activationEvents": [],
+  "contributes": {
+    "notebookRenderer": [
+      {
+        "id": "markdownItRenderer-katex",
+        "displayName": "Markdown it KaTeX renderer",
+        "entrypoint": {
+          "extends": "markdownItRenderer",
+          "path": "./notebook-out/katex.js"
+        }
+      }
+    ],
+    "markdown.markdownItPlugins": true,
+    "markdown.previewStyles": [
+      "./node_modules/katex/dist/katex.min.css",
+      "./preview-styles/index.css"
+    ],
+    "configuration": [
+      {
+        "title": "Markdown",
+        "properties": {
+          "markdown.math.enabled": {
+            "type": "boolean",
+            "default": true,
+            "description": "%config.markdown.math.enabled%"
+          }
+        }
+      }
+    ]
+  },
+  "scripts": {
+    "compile": "npm run build-notebook",
+    "watch": "npm run build-notebook",
+    "build-notebook": "node ./esbuild"
+  },
+  "dependencies": {
+    "@iktakahiro/markdown-it-katex": "https://github.com/mjbvz/markdown-it-katex.git"
+  },
+  "devDependencies": {
+    "@types/markdown-it": "^0.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
+  }
+}

extensions/markdown-math/package.nls.json

@@ -0,0 +1,5 @@
+{
+	"displayName": "Markdown Math",
+	"description": "Adds math support to markdown in notebooks.",
+	"config.markdown.math.enabled": "Enable/disable rendering math in the built-in markdown preview."
+}

extensions/markdown-math/preview-styles/index.css

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.katex-error {
+	color: var(--vscode-editorError-foreground);
+}

extensions/markdown-math/src/extension.ts

@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as vscode from 'vscode';
+
+const enabledSetting = 'markdown.math.enabled';
+
+export function activate(context: vscode.ExtensionContext) {
+	function isEnabled(): boolean {
+		const config = vscode.workspace.getConfiguration('markdown');
+		console.log(config.get<boolean>('math.enabled', true));
+		return config.get<boolean>('math.enabled', true);
+	}
+
+	vscode.workspace.onDidChangeConfiguration(e => {
+		if (e.affectsConfiguration(enabledSetting)) {
+			vscode.commands.executeCommand('markdown.api.reloadPlugins');
+		}
+	}, undefined, context.subscriptions);
+
+	return {
+		extendMarkdownIt(md: any) {
+			if (isEnabled()) {
+				const katex = require('@iktakahiro/markdown-it-katex');
+				return md.use(katex);
+			}
+			return md;
+		}
+	};
+}

extensions/markdown-math/src/types.d.ts

@@ -0,0 +1 @@
+/// <reference path='../../../src/vs/vscode.d.ts'/>

extensions/markdown-math/tsconfig.json

@@ -0,0 +1,17 @@
+{
+	"extends": "../tsconfig.base.json",
+	"compilerOptions": {
+		"outDir": "./out",
+		"experimentalDecorators": true,
+		"lib": [
+			"es6",
+			"es2015.promise",
+			"es2019.array",
+			"es2020.string",
+			"dom"
+		]
+	},
+	"include": [
+		"src/**/*"
+	]
+}

extensions/markdown-math/yarn.lock

@@ -0,0 +1,26 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@iktakahiro/markdown-it-katex@https://github.com/mjbvz/markdown-it-katex.git":
+  version "4.0.1"
+  resolved "https://github.com/mjbvz/markdown-it-katex.git#2bf0b89c6c22ef0b585f55ccab66d1f7c5356bea"
+  dependencies:
+    katex "^0.13.0"
+
+"@types/markdown-it@^0.0.0":
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-0.0.0.tgz#8f6acaa5e3245e275f684e95deb3e518d1c6ab16"
+  integrity sha1-j2rKpeMkXidfaE6V3rPlGNHGqxY=
+
+commander@^6.0.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
+  integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
+
+katex@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/katex/-/katex-0.13.0.tgz#62900e56c1ad8fdf7da23399e50d7a7b690b39ab"
+  integrity sha512-6cHbzbegYgS9vvVGuH8UA+o97X+ZshtboSqJJCdq7trBYzuD75JNwr7Ef606xkUjecPPhFnyB+afx1dVafielg==
+  dependencies:
+    commander "^6.0.0"