Merge branch 'main' into joh/swc

Author: jrieken

.eslintrc.json

@@ -248,6 +248,7 @@
 							"url",
 							"util",
 							"v8-inspect-profiler",
+							"vscode-policy-watcher",
 							"vscode-proxy-agent",
 							"vscode-regexpp",
 							"vscode-textmate",

build/.moduleignore

@@ -107,6 +107,14 @@ vscode-encrypt/binding.gyp
 vscode-encrypt/README.md
 !vscode-encrypt/build/Release/vscode-encrypt-native.node
 
+vscode-policy-watcher/build/**
+vscode-policy-watcher/.husky/**
+vscode-policy-watcher/src/**
+vscode-policy-watcher/binding.gyp
+vscode-policy-watcher/README.md
+vscode-policy-watcher/index.d.ts
+!vscode-policy-watcher/build/Release/vscode-policy-watcher.node
+
 vscode-windows-ca-certs/**/*
 !vscode-windows-ca-certs/package.json
 !vscode-windows-ca-certs/**/*.node

extensions/ipynb/package.json

@@ -9,7 +9,6 @@
 		"vscode": "^1.57.0"
 	},
 	"enabledApiProposals": [
-		"notebookEditor",
     "notebookWorkspaceEdit"
 	],
 	"activationEvents": [

extensions/ipynb/tsconfig.json

@@ -9,7 +9,6 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.notebookEditor.d.ts",
 		"../../src/vscode-dts/vscode.proposed.notebookWorkspaceEdit.d.ts"
 	]
 }

extensions/markdown-language-features/notebook/index.ts

@@ -9,7 +9,57 @@ import type * as MarkdownItToken from 'markdown-it/lib/token';
 import type { ActivationFunction } from 'vscode-notebook-renderer';
 
 const sanitizerOptions: DOMPurify.Config = {
-	ALLOWED_TAGS: ['a', 'button', 'blockquote', 'code', 'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'img', 'input', 'label', 'li', 'p', 'pre', 'select', 'small', 'span', 'strong', 'textarea', 'ul', 'ol'],
+	ALLOWED_TAGS: [
+		'a',
+		'b',
+		'blockquote',
+		'br',
+		'button',
+		'caption',
+		'center',
+		'code',
+		'col',
+		'colgroup',
+		'details',
+		'div',
+		'em',
+		'font',
+		'h1',
+		'h2',
+		'h3',
+		'h4',
+		'h5',
+		'h6',
+		'hr',
+		'i',
+		'img',
+		'input',
+		'kbd',
+		'label',
+		'li',
+		'ol',
+		'p',
+		'pre',
+		'select',
+		'small',
+		'span',
+		'strong',
+		'sub',
+		'summary',
+		'sup',
+		'table',
+		'tbody',
+		'td',
+		'textarea',
+		'tfoot',
+		'th',
+		'thead',
+		'tr',
+		'tt',
+		'u',
+		'ul',
+		'video',
+	],
 };
 
 export const activate: ActivationFunction<void> = (ctx) => {

extensions/markdown-language-features/src/languageFeatures/diagnostics.ts

@@ -494,7 +494,7 @@ export class DiagnosticComputer {
 						if (fragmentLinks.length) {
 							const toc = await TableOfContents.create(this.engine, hrefDoc);
 							for (const link of fragmentLinks) {
-								if (!toc.lookup(link.fragment) && !this.isIgnoredLink(options, link.source.text)) {
+								if (!toc.lookup(link.fragment) && !this.isIgnoredLink(options, link.source.pathText) && !this.isIgnoredLink(options, link.source.text)) {
 									const msg = localize('invalidLinkToHeaderInOtherFile', 'Header does not exist in file: {0}', link.fragment);
 									diagnostics.push(new LinkDoesNotExistDiagnostic(link.source.hrefRange, msg, severity, link.source.text));
 								}

extensions/markdown-language-features/src/test/diagnostic.test.ts

@@ -256,4 +256,16 @@ suite('markdown: Diagnostics', () => {
 			assert.deepStrictEqual(diagnostics.length, 0);
 		}
 	});
+
+	test('ignoreLinks should support ignore header links if file is ignored', async () => {
+		const doc1 = new InMemoryDocument(workspacePath('doc1.md'), joinLines(
+			`![i](/doc2.md#no-such)`,
+		));
+		const doc2 = new InMemoryDocument(workspacePath('doc2.md'), joinLines(''));
+
+		const contents = new InMemoryWorkspaceMarkdownDocuments([doc1, doc2]);
+		const manager = createDiagnosticsManager(contents, new MemoryDiagnosticConfiguration(true, ['/doc2.md']));
+		const { diagnostics } = await manager.recomputeDiagnosticState(doc1, noopToken);
+		assert.deepStrictEqual(diagnostics.length, 0);
+	});
 });

extensions/notebook-renderers/tsconfig.json

@@ -9,7 +9,6 @@
 	"include": [
 		"src/**/*",
 		"../../src/vscode-dts/vscode.d.ts",
-		"../../src/vscode-dts/vscode.proposed.notebookEditor.d.ts",
 		"../../src/vscode-dts/vscode.proposed.notebookEditorEdit.d.ts",
 	]
 }

extensions/vscode-api-tests/package.json

@@ -24,7 +24,6 @@
     "notebookControllerKind",
     "notebookDebugOptions",
     "notebookDeprecated",
-    "notebookEditor",
     "notebookEditorDecorationType",
     "notebookEditorEdit",
     "notebookLiveShare",

extensions/vscode-notebook-tests/package.json

@@ -15,7 +15,6 @@
     "notebookControllerKind",
     "notebookDebugOptions",
     "notebookDeprecated",
-    "notebookEditor",
     "notebookEditorDecorationType",
     "notebookLiveShare",
     "notebookMessaging",