[pull] main from microsoft:main

.vscode/extensions/vscode-selfhost-import-aid/tsconfig.json

@@ -1,6 +1,7 @@
 {
 	"extends": "../../../extensions/tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node",

.vscode/extensions/vscode-selfhost-test-provider/tsconfig.json

@@ -1,6 +1,7 @@
 {
 	"extends": "../../../extensions/tsconfig.base.json",
 	"compilerOptions": {
+		"rootDir": "./src",
 		"outDir": "./out",
 		"types": [
 			"node",

build/lib/watch/index.ts

@@ -34,12 +34,7 @@ const subscriptionCache: Map<string, { stream: Stream; subscription: Promise<wat
 function createWatcher(root: string): Stream {
 	const result = es.through();
 
-	const subscription = watcher.subscribe(root, (err, events) => {
-		if (err) {
-			result.emit('error', err);
-			return;
-		}
-
+	const subscription = watcher.subscribe(root, (_err, events) => {
 		for (const event of events) {
 			const relativePath = path.relative(root, event.path);
 
@@ -62,8 +57,6 @@ function createWatcher(root: string): Stream {
 		]
 	});
 
-	subscription.catch(err => result.emit('error', err));
-
 	// Cleanup on process exit
 	const cleanup = () => {
 		subscription.then(sub => sub.unsubscribe()).catch(() => { });

extensions/mermaid-chat-features/package.nls.json

@@ -1,5 +1,5 @@
 {
 	"displayName": "Mermaid Chat Features",
 	"description": "Adds Mermaid diagram support to built-in chats.",
-	"config.enabled.description": "Enable a tool for experimental Mermaid diagram rendering in chat responses."
+	"config.enabled.description": "Enable a tool for Mermaid diagram rendering in chat responses."
 }