Merge branch 'microsoft:main' into justin/CodeActionMenu-Widget

Author: justschen

.github/commands.json

@@ -154,7 +154,7 @@
 			"IllusionMH"
 		],
 		"action": "updateLabels",
-		"addLabel": "~needs more info"
+		"addLabel": "~info-needed"
 	},
 	{
 		"type": "comment",
@@ -165,14 +165,14 @@
 			"gjsjohnmurray",
 			"IllusionMH"
 		],
-		"addLabel": "needs more info",
+		"addLabel": "info-needed",
 		"comment": "Thanks for creating this issue regarding performance! Please follow this guide to help us diagnose performance issues: https://github.com/microsoft/vscode/wiki/Performance-Issues \n\nHappy Coding!"
 	},
 	{
 		"type": "comment",
 		"name": "jsDebugLogs",
 		"action": "updateLabels",
-		"addLabel": "needs more info",
+		"addLabel": "info-needed",
 		"comment": "Please collect trace logs using the following instructions:\n\n> If you're able to, add `\"trace\": true` to your `launch.json` and reproduce the issue. The location of the log file on your disk will be written to the Debug Console. Share that with us.\n>\n> ⚠️ This log file will not contain source code, but will contain file paths. You can drop it into https://microsoft.github.io/vscode-pwa-analyzer/index.html to see what it contains. If you'd rather not share the log publicly, you can email it to [email protected]"
 	},
 	{
@@ -189,17 +189,17 @@
 	},
 	{
 		"type": "label",
-		"name": "~needs more info",
+		"name": "~info-needed",
 		"action": "updateLabels",
-		"addLabel": "needs more info",
-		"removeLabel": "~needs more info",
+		"addLabel": "info-needed",
+		"removeLabel": "~info-needed",
 		"comment": "Thanks for creating this issue! We figured it's missing some basic information or in some other way doesn't follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). Please take the time to review these and update the issue.\n\nHappy Coding!"
 	},
 	{
 		"type": "label",
 		"name": "~needs version info",
 		"action": "updateLabels",
-		"addLabel": "needs more info",
+		"addLabel": "info-needed",
 		"removeLabel": "~needs version info",
 		"comment": "Thanks for creating this issue! We figured it's missing some basic information, such as a version number, or in some other way doesn't follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). Please take the time to review these and update the issue.\n\nHappy Coding!"
 	},
@@ -416,7 +416,7 @@
 			"IllusionMH"
 		],
 		"action": "comment",
-		"addLabel": "needs more info",
+		"addLabel": "info-needed",
 		"comment": "Thanks for reporting this issue! Unfortunately, it's hard for us to understand what issue you're seeing. Please help us out by providing a screen recording showing exactly what isn't working as expected. While we can work with most standard formats, `.gif` files are preferred as they are displayed inline on GitHub. You may find https://gifcap.dev helpful as a browser-based gif recording tool.\n\nIf the issue depends on keyboard input, you can help us by enabling screencast mode for the recording (`Developer: Toggle Screencast Mode` in the command palette).\n\nHappy coding!"
 	},
 	{

build/lib/compilation.js

@@ -188,6 +188,15 @@ class MonacoGenerator {
     }
 }
 function generateApiProposalNames() {
+    let eol;
+    try {
+        const src = fs.readFileSync('src/vs/workbench/services/extensions/common/extensionsApiProposals.ts', 'utf-8');
+        const match = /\r?\n/m.exec(src);
+        eol = match ? match[0] : os.EOL;
+    }
+    catch {
+        eol = os.EOL;
+    }
     const pattern = /vscode\.proposed\.([a-zA-Z]+)\.d\.ts$/;
     const proposalNames = new Set();
     const input = es.through();
@@ -214,7 +223,7 @@ function generateApiProposalNames() {
             '});',
             'export type ApiProposalName = keyof typeof allApiProposals;',
             '',
-        ].join(os.EOL);
+        ].join(eol);
         this.emit('data', new File({
             path: 'vs/workbench/services/extensions/common/extensionsApiProposals.ts',
             contents: Buffer.from(contents)

build/lib/compilation.ts

@@ -226,6 +226,16 @@ class MonacoGenerator {
 }
 
 function generateApiProposalNames() {
+	let eol: string;
+
+	try {
+		const src = fs.readFileSync('src/vs/workbench/services/extensions/common/extensionsApiProposals.ts', 'utf-8');
+		const match = /\r?\n/m.exec(src);
+		eol = match ? match[0] : os.EOL;
+	} catch {
+		eol = os.EOL;
+	}
+
 	const pattern = /vscode\.proposed\.([a-zA-Z]+)\.d\.ts$/;
 	const proposalNames = new Set<string>();
 
@@ -254,7 +264,7 @@ function generateApiProposalNames() {
 				'});',
 				'export type ApiProposalName = keyof typeof allApiProposals;',
 				'',
-			].join(os.EOL);
+			].join(eol);
 
 			this.emit('data', new File({
 				path: 'vs/workbench/services/extensions/common/extensionsApiProposals.ts',

extensions/ipynb/esbuild.js

@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+//@ts-check
+
+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 srcDir = path.join(__dirname, 'src');
+const outDir = path.join(outputRoot, 'out');
+
+async function build() {
+	await esbuild.build({
+		entryPoints: [
+			path.join(srcDir, 'cellAttachmentRenderer.ts'),
+		],
+		bundle: true,
+		minify: false,
+		sourcemap: false,
+		format: 'esm',
+		outdir: outDir,
+		platform: 'browser',
+		target: ['es2020'],
+	});
+}
+
+
+build().catch(() => process.exit(1));
+
+if (isWatch) {
+	const watcher = require('@parcel/watcher');
+	watcher.subscribe(srcDir, () => {
+		return build();
+	});
+}

extensions/ipynb/package.json

@@ -51,6 +51,16 @@
 				"priority": "default"
 			}
 		],
+    "notebookRenderer": [
+      {
+        "id": "vscode.markdown-it-cell-attachment-renderer",
+        "displayName": "Markdown it ipynb Cell Attachment renderer",
+        "entrypoint": {
+          "extends": "vscode.markdown-it-renderer",
+          "path": "./out/cellAttachmentRenderer.js"
+        }
+      }
+    ],
 		"menus": {
 			"file/newFile": [
 				{
@@ -70,8 +80,9 @@
 		}
 	},
 	"scripts": {
-		"compile": "npx gulp compile-extension:ipynb",
-		"watch": "npx gulp watch-extension:ipynb"
+		"compile": "npx gulp compile-extension:ipynb && npm run build-notebook",
+		"watch": "npx gulp watch-extension:ipynb",
+		"build-notebook": "node ./esbuild"
 	},
 	"dependencies": {
 		"@enonic/fnv-plus": "^1.3.0",
@@ -80,6 +91,7 @@
 	},
 	"devDependencies": {
 		"@jupyterlab/nbformat": "^3.2.9",
+		"@types/markdown-it": "12.2.3",
 		"@types/uuid": "^8.3.1"
 	},
 	"repository": {

extensions/ipynb/src/cellAttachmentRenderer.ts

@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type * as MarkdownIt from 'markdown-it';
+import type * as MarkdownItToken from 'markdown-it/lib/token';
+import type { RendererContext } from 'vscode-notebook-renderer';
+
+interface MarkdownItRenderer {
+	extendMarkdownIt(fn: (md: MarkdownIt) => void): void;
+}
+
+export async function activate(ctx: RendererContext<void>) {
+	const markdownItRenderer = (await ctx.getRenderer('vscode.markdown-it-renderer')) as MarkdownItRenderer | any;
+	if (!markdownItRenderer) {
+		throw new Error(`Could not load 'vscode.markdown-it-renderer'`);
+	}
+
+	markdownItRenderer.extendMarkdownIt((md: MarkdownIt) => {
+		const original = md.renderer.rules.image;
+		md.renderer.rules.image = (tokens: MarkdownItToken[], idx: number, options, env, self) => {
+			const token = tokens[idx];
+			const src = token.attrGet('src');
+			const attachments: Record<string, Record<string, string>> = env.outputItem.metadata?.custom?.attachments;
+			if (attachments && src) {
+				const [attachmentKey, attachmentVal] = Object.entries(attachments[src.replace('attachment:', '')])[0];
+				const b64Markdown = 'data:' + attachmentKey + ';base64,' + attachmentVal;
+				token.attrSet('src', b64Markdown);
+			}
+
+			if (original) {
+				return original(tokens, idx, options, env, self);
+			} else {
+				return self.renderToken(tokens, idx, options);
+			}
+		};
+	});
+}

extensions/ipynb/yarn.lock

@@ -8,21 +8,39 @@
   integrity sha512-BCN9uNWH8AmiP7BXBJqEinUY9KXalmRzo+L0cB/mQsmFfzODxwQrbvxCHXUNH2iP+qKkWYtB4vyy8N62PViMFw==
 
 "@jupyterlab/nbformat@^3.2.9":
-  version "3.2.9"
-  resolved "https://registry.yarnpkg.com/@jupyterlab/nbformat/-/nbformat-3.2.9.tgz#e7d854719612133498af4280d9a8caa0873205b0"
-  integrity sha512-WSf9OQo8yfFjyodbXRdFoaNwMkaAL5jFZiD6V2f8HqI380ipansWrrV7R9CGzPfgKHpUGZMO1tYKmUwzMhvZ4w==
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/@jupyterlab/nbformat/-/nbformat-3.4.3.tgz#cbab1bf507677b7f0f309d8353fc83fe5a973c82"
+  integrity sha512-i/yADrwhhAJJCUOTa+fEBMyJO7fvX9Y73I0B7V6dQhGcrmrEKLC3wk4yOo63+jRntd5+dupbiOtz3w1ncIXwIA==
   dependencies:
-    "@lumino/coreutils" "^1.5.3"
+    "@lumino/coreutils" "^1.11.0"
 
-"@lumino/coreutils@^1.5.3":
+"@lumino/coreutils@^1.11.0":
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/@lumino/coreutils/-/coreutils-1.12.0.tgz#fbdef760f736eaf2bd396a5c6fc3a68a4b449b15"
   integrity sha512-DSglh4ylmLi820CNx9soJmDJCpUgymckdWeGWuN0Ash5g60oQvrQDfosVxEhzmNvtvXv45WZEqSBzDP6E5SEmQ==
 
+"@types/linkify-it@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
+  integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
+
+"@types/[email protected]":
+  version "12.2.3"
+  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
+  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
+  dependencies:
+    "@types/linkify-it" "*"
+    "@types/mdurl" "*"
+
+"@types/mdurl@*":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
+  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
+
 "@types/uuid@^8.3.1":
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.1.tgz#1a32969cf8f0364b3d8c8af9cc3555b7805df14f"
-  integrity sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==
+  version "8.3.4"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
+  integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
 
 detect-indent@^6.0.0:
   version "6.1.0"

extensions/markdown-language-features/server/package.json

@@ -13,7 +13,7 @@
     "vscode-languageserver": "^8.0.2-next.5`",
     "vscode-languageserver-textdocument": "^1.0.5",
     "vscode-languageserver-types": "^3.17.1",
-    "vscode-markdown-languageservice": "^0.0.0-alpha.11",
+    "vscode-markdown-languageservice": "^0.0.0-alpha.12",
     "vscode-uri": "^3.0.3"
   },
   "devDependencies": {

extensions/markdown-language-features/server/src/workspace.ts

@@ -69,6 +69,7 @@ export class VsCodeClientWorkspace implements md.IWorkspaceWithWatching {
 		connection.onDidChangeWatchedFiles(async ({ changes }) => {
 			for (const change of changes) {
 				const resource = URI.parse(change.uri);
+				this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: onDidChangeWatchedFiles', `${change.type}: ${resource}`);
 				switch (change.type) {
 					case FileChangeType.Changed: {
 						this._documentCache.delete(resource);
@@ -95,10 +96,13 @@ export class VsCodeClientWorkspace implements md.IWorkspaceWithWatching {
 		});
 
 		connection.onRequest(protocol.fs_watcher_onChange, params => {
+			this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: fs_watcher_onChange', `${params.kind}: ${params.uri}`);
+
 			const watcher = this._watchers.get(params.id);
 			if (!watcher) {
 				return;
 			}
+
 			switch (params.kind) {
 				case 'create': watcher.onDidCreate.fire(URI.parse(params.uri)); return;
 				case 'change': watcher.onDidChange.fire(URI.parse(params.uri)); return;
@@ -211,14 +215,16 @@ export class VsCodeClientWorkspace implements md.IWorkspaceWithWatching {
 	}
 
 	watchFile(resource: URI, options: FileWatcherOptions): IFileSystemWatcher {
+		const id = this._watcherPool++;
+		this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: watchFile', `(${id}) ${resource}`);
+
 		const entry = {
 			resource,
 			options,
 			onDidCreate: new Emitter<URI>(),
 			onDidChange: new Emitter<URI>(),
 			onDidDelete: new Emitter<URI>(),
 		};
-		const id = this._watcherPool++;
 		this._watchers.set(id, entry);
 
 		this.connection.sendRequest(protocol.fs_watcher_create, {
@@ -232,6 +238,7 @@ export class VsCodeClientWorkspace implements md.IWorkspaceWithWatching {
 			onDidChange: entry.onDidChange.event,
 			onDidDelete: entry.onDidDelete.event,
 			dispose: () => {
+				this.logger.log(md.LogLevel.Trace, 'VsCodeClientWorkspace: disposeWatcher', `(${id}) ${resource}`);
 				this.connection.sendRequest(protocol.fs_watcher_delete, { id });
 				this._watchers.delete(id);
 			}

extensions/markdown-language-features/server/yarn.lock

@@ -47,10 +47,10 @@ vscode-languageserver@^8.0.2-next.5`:
   dependencies:
     vscode-languageserver-protocol "3.17.2-next.6"
 
-vscode-markdown-languageservice@^0.0.0-alpha.11:
-  version "0.0.0-alpha.11"
-  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.0.0-alpha.11.tgz#9dcdfc23f9dcaeaca3b2a2c76fc504619eaeb284"
-  integrity sha512-syFamf99xx+Q9DkA66+8fbSz2A2LJkyOV+nSziGgAzdDPv4jkb7eWF6l+nUteHTGbRLQ+q0tfkj0A7OovueCSQ==
+vscode-markdown-languageservice@^0.0.0-alpha.12:
+  version "0.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.0.0-alpha.12.tgz#5a3c7559969c3cb455d508d48129c8e221589630"
+  integrity sha512-9dJ/GL6A9UUOcB1TpvgsbcwqsYjnxHx4jxDaqeZZEMWFSUySfp0PAn1ge2S2Qj00zypvsu0eCTGUNd56G1/BNQ==
   dependencies:
     picomatch "^2.3.1"
     vscode-languageserver-textdocument "^1.0.5"