Merge vscode source through 1.62 release (#19981)

* Build breaks 1

* Build breaks

* Build breaks

* Build breaks

* More build breaks

* Build breaks (#2512)

* Runtime breaks

* Build breaks

* Fix dialog location break

* Update typescript

* Fix ASAR break issue

* Unit test breaks

* Update distro

* Fix breaks in ADO builds (#2513)

* Bump to node 16

* Fix hygiene errors

* Bump distro

* Remove reference to node type

* Delete vscode specific extension

* Bump to node 16 in CI yaml

* Skip integration tests in CI builds (while fixing)

* yarn.lock update

* Bump moment dependency in remote yarn

* Fix drop-down chevron style

* Bump to node 16

* Remove playwrite from ci.yaml

* Skip building build scripts in hygine check

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

@@ -3,22 +3,22 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const MarkdownIt = require('markdown-it');
+const MarkdownIt: typeof import('markdown-it') = require('markdown-it');
 import * as DOMPurify from 'dompurify';
-import type * as markdownIt from 'markdown-it';
+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'],
 };
 
-export function activate(ctx: { workspace: { isTrusted: boolean } }) {
+export const activate: ActivationFunction<void> = (ctx) => {
 	let markdownIt = new MarkdownIt({
 		html: true
 	});
 	addNamedHeaderRendering(markdownIt);
 
 	const style = document.createElement('style');
-	style.classList.add('markdown-style');
 	style.textContent = `
 		.emptyMarkdownCell::before {
 			content: "${document.documentElement.style.getPropertyValue('--notebook-cell-markup-empty-content')}";
@@ -54,16 +54,19 @@ export function activate(ctx: { workspace: { isTrusted: boolean } }) {
 		}
 
 		h1 {
-			font-size: 26px;
-			line-height: 31px;
-			margin: 0;
-			margin-bottom: 13px;
+			font-size: 2.25em;
 		}
 
 		h2 {
-			font-size: 19px;
-			margin: 0;
-			margin-bottom: 10px;
+			font-size: 1.9em;
+		}
+
+		h3 {
+			font-size: 1.6em;
+		}
+
+		p {
+			font-size: 1.1em;
 		}
 
 		h1,
@@ -141,10 +144,13 @@ export function activate(ctx: { workspace: { isTrusted: boolean } }) {
 			white-space: pre-wrap;
 		}
 	`;
-	document.head.append(style);
+	const template = document.createElement('template');
+	template.classList.add('markdown-style');
+	template.content.appendChild(style);
+	document.head.appendChild(template);
 
 	return {
-		renderOutputItem: (outputInfo: { text(): string }, element: HTMLElement) => {
+		renderOutputItem: (outputInfo, element) => {
 			let previewNode: HTMLElement;
 			if (!element.shadowRoot) {
 				const previewRoot = element.attachShadow({ mode: 'open' });
@@ -155,15 +161,19 @@ export function activate(ctx: { workspace: { isTrusted: boolean } }) {
 				previewRoot.appendChild(defaultStyles.cloneNode(true));
 
 				// And then contributed styles
-				for (const markdownStyleNode of document.getElementsByClassName('markdown-style')) {
-					previewRoot.appendChild(markdownStyleNode.cloneNode(true));
+				for (const element of document.getElementsByClassName('markdown-style')) {
+					if (element instanceof HTMLTemplateElement) {
+						previewRoot.appendChild(element.content.cloneNode(true));
+					} else {
+						previewRoot.appendChild(element.cloneNode(true));
+					}
 				}
 
 				previewNode = document.createElement('div');
 				previewNode.id = 'preview';
 				previewRoot.appendChild(previewNode);
 			} else {
-				previewNode = element.shadowRoot.getElementById('preview')! as HTMLElement; // {{SQL CARBON EDIT}} Cast to fix compilation error
+				previewNode = element.shadowRoot.getElementById('preview')!;
 			}
 
 			const text = outputInfo.text();
@@ -174,24 +184,24 @@ export function activate(ctx: { workspace: { isTrusted: boolean } }) {
 				previewNode.classList.remove('emptyMarkdownCell');
 
 				const unsanitizedRenderedMarkdown = markdownIt.render(text);
-				previewNode.innerHTML = ctx.workspace.isTrusted
+				previewNode.innerHTML = <any>(ctx.workspace.isTrusted
 					? unsanitizedRenderedMarkdown
-					: DOMPurify.sanitize(unsanitizedRenderedMarkdown, sanitizerOptions);
+					: DOMPurify.sanitize(unsanitizedRenderedMarkdown, sanitizerOptions));
 			}
 		},
 		extendMarkdownIt: (f: (md: typeof markdownIt) => void) => {
 			f(markdownIt);
 		}
 	};
-}
+};
 
 
-function addNamedHeaderRendering(md: markdownIt.MarkdownIt): void {
+function addNamedHeaderRendering(md: InstanceType<typeof MarkdownIt>): void {
 	const slugCounter = new Map<string, number>();
 
 	const originalHeaderOpen = md.renderer.rules.heading_open;
-	md.renderer.rules.heading_open = (tokens: markdownIt.Token[], idx: number, options: any, env: any, self: any) => {
-		const title = tokens[idx + 1].children.reduce((acc: string, t: any) => acc + t.content, '');
+	md.renderer.rules.heading_open = (tokens: MarkdownItToken[], idx: number, options, env, self) => {
+		const title = tokens[idx + 1].children!.reduce<string>((acc, t) => acc + t.content, '');
 		let slug = slugFromHeading(title);
 
 		if (slugCounter.has(slug)) {
@@ -202,13 +212,12 @@ function addNamedHeaderRendering(md: markdownIt.MarkdownIt): void {
 			slugCounter.set(slug, 0);
 		}
 
-		tokens[idx].attrs = tokens[idx].attrs || [];
-		tokens[idx].attrs.push(['id', slug]);
+		tokens[idx].attrSet('id', slug);
 
 		if (originalHeaderOpen) {
 			return originalHeaderOpen(tokens, idx, options, env, self);
 		} else {
-			return self.renderToken(tokens, idx, options, env, self);
+			return self.renderToken(tokens, idx, options);
 		}
 	};
 

extensions/markdown-language-features/notebook/tsconfig.json

@@ -3,6 +3,7 @@
 	"compilerOptions": {
 		"outDir": "./dist/",
 		"jsx": "react",
+		"moduleResolution": "Node",
 		"module": "es2020",
 		"lib": [
 			"es2018",