Merge remote-tracking branch 'origin/main' into tyriar/181837

Author: Tyriar

.yarnrc

@@ -1,5 +1,5 @@
 disturl "https://electronjs.org/headers"
-target "22.3.13"
-ms_build_id "21803499"
+target "22.3.14"
+ms_build_id "21893604"
 runtime "electron"
 build_from_source "true"

build/checksums/electron.txt

@@ -1,27 +1,27 @@
-2e153664ca2d5fdcb0a717cbb7e836ecba2681a43327f38541e3b1f23b27f612 *electron-v22.3.13-darwin-arm64-symbols.zip
-edd48266e3726284e374b83c0db39ff18e9ef0b7176b2b22d816fdf37ba7d07a *electron-v22.3.13-darwin-arm64.zip
-4a660e202b8aeed7279de3a802ca1f6aa9c4cd2fb351e17d37d89c5b2b8ee88f *electron-v22.3.13-darwin-x64-symbols.zip
-b62b718824d686ae9deb400dc74cc86fde0710735af26d449bf720ec89b13e7f *electron-v22.3.13-darwin-x64.zip
-6d8ef72edc000db6507b3295902aa4f30d9fe7fa8108388a1077f863ba11b778 *electron-v22.3.13-linux-arm64-symbols.zip
-1f85d242d2d6d151c604f516eff984da57797cd5d2708bbc07d88a4258bfb1f1 *electron-v22.3.13-linux-arm64.zip
-49d1a786c8ab5062f9491a190b1f3e22c54f7446a6697a01fef6b953e72d1a8d *electron-v22.3.13-linux-armv7l-symbols.zip
-d396a7722f63163e63b9f660328a1c1e992284e5fd9dd5f6d0dca572eb34528a *electron-v22.3.13-linux-armv7l.zip
-5efcbf5f3ab1bb8a25f1e51d49a22e524f4c609e5ab62f5ecc7350364e01fa57 *electron-v22.3.13-linux-x64-symbols.zip
-c568012570aa4e1ead7f28f63e698c268356c45c878561c1ade727b612bffbda *electron-v22.3.13-linux-x64.zip
-af336308d3c0455c76eeb218febc3025bbdeffccfdf3e2a8d5c11cbfed07f60c *electron-v22.3.13-win32-arm64-pdb.zip
-450f7921563a7e62cdf99df7b2c78840438fb8191aac81eeb5c74ffc34d085b6 *electron-v22.3.13-win32-arm64-symbols.zip
-ac5fe8d782588911fe7f2ebce1d79a72049848a1d7936af161fd6c79f7715db6 *electron-v22.3.13-win32-arm64.zip
-28974547d19138d03033be29bd6b894afa81ad935df5c55d3069f9d575ffb4d7 *electron-v22.3.13-win32-ia32-pdb.zip
-2d20f6cefca0ee1e73b66a0b4914c2bb88a01c622ed82a80c2ac20aac9ddefec *electron-v22.3.13-win32-ia32-symbols.zip
-af5730eb327634fc56dd6ebef7ebffb1679fa75d48fa8cca75d701c0c006a4bc *electron-v22.3.13-win32-ia32.zip
-ed133e9cf47121f3d8211dd3a47f218fa87bc667bed953b2a79074d9ecd1e37b *electron-v22.3.13-win32-x64-pdb.zip
-da3db91fe904fe8ac27182e39260bbdc30262aa0b3f1a94b06d7aadc72053829 *electron-v22.3.13-win32-x64-symbols.zip
-36e84e789e61931ed1b417059aae7d04fe0b70f929e19f088c2b95c6bb7d5b05 *electron-v22.3.13-win32-x64.zip
-49b351092088c781095f33a675c586161ef7e0ae9f4da159aef9ab4caf172018 *ffmpeg-v22.3.13-darwin-arm64.zip
-040b749109b89b6b5569faf1b7a3718b8cbc25375b1db01ffa91624e0d01c0d9 *ffmpeg-v22.3.13-darwin-x64.zip
-59d2e2b2f2cc515a86a4e0cfd1116d10a8b25a8d58d45bb04de3512e156c944b *ffmpeg-v22.3.13-linux-arm64.zip
-b9d3b227bee17666d395ee7882ef477a733c3eeef3f1d9f2e3616d2d02eb3376 *ffmpeg-v22.3.13-linux-armv7l.zip
-fa07ef910b23a4ef4b6761bc16d20c0e70ff0259325c4d523129e2d9c5084174 *ffmpeg-v22.3.13-linux-x64.zip
-c38b135b7025750ca44e3cc08e1c913ab095a28336915753195d3287be07578d *ffmpeg-v22.3.13-win32-arm64.zip
-57f0baa841cb49ed3ae63e54466d175b12838939be786b86465bdd192dce7cdc *ffmpeg-v22.3.13-win32-ia32.zip
-f77162496ad8e408fb5c153ba7842ec7d3964785d0f7231b3d4903088e0ab1cd *ffmpeg-v22.3.13-win32-x64.zip
+3ba067c6f338f9a525c4b697e9cf8e3c3b3d9f6abfdfb11fba47e053da0f3496 *electron-v22.3.14-darwin-arm64-symbols.zip
+c08bf19e11c006346b210585cf0803cd0b07107a362a2414cc185f6a228afbf2 *electron-v22.3.14-darwin-arm64.zip
+72ced94e7230d3138dd84acbf38dc593d4a93ec796a3a478f99aa6974030d79c *electron-v22.3.14-darwin-x64-symbols.zip
+77c1c96411326b00d3ef7c9f6af96a3b4c2fa2314196fce3374fcf734dd8dc67 *electron-v22.3.14-darwin-x64.zip
+d847c59f3835749dcdd5376daefb3a5992f1ed5d7693f871328296e1388fb69d *electron-v22.3.14-linux-arm64-symbols.zip
+95bb9ee160c60b50ff25b307fb8bc36bdb5297d43c6e366f0b835f36c4f327c9 *electron-v22.3.14-linux-arm64.zip
+38a51d81f9ffe6e2ebf25844999fddbeb4edc63ae22136af1502db373bb024ab *electron-v22.3.14-linux-armv7l-symbols.zip
+bf589c74f07fe11586ffcf8c122d34b91c5ced08d54532ee883d1e025b6d1b02 *electron-v22.3.14-linux-armv7l.zip
+28d0eda61ea736375c549d0955f36b7d3e3c2019453ef83d793dae8b0d74f461 *electron-v22.3.14-linux-x64-symbols.zip
+89b72e40fb8b9106deda3e6ffa30dd80beaa8f2e2a9d037b55c034a5a27a7b60 *electron-v22.3.14-linux-x64.zip
+b9ba15fcf7c60cf57e95fae731bc0c336e131ed4fac91b4c59d50a28407ca0b0 *electron-v22.3.14-win32-arm64-pdb.zip
+9f375d01feeb9e28f9c0913a4e22be900c0a7ff4e51449bb9b859ce1bd18f9f3 *electron-v22.3.14-win32-arm64-symbols.zip
+17e354aca0683f79d79f7fa7ecfa8a4381b356d04fa45ec0aa85b5f048151c10 *electron-v22.3.14-win32-arm64.zip
+900ca316ce939547ab62847c8833a78c1002a69b936be7e9af328a3518a7d379 *electron-v22.3.14-win32-ia32-pdb.zip
+90af7a48b4e722a3436b6a8893540fb746d99b4832ca48c355a63fa0930f6446 *electron-v22.3.14-win32-ia32-symbols.zip
+487d811c7cf3282f4c3a17b5ab7ab1fd71dbc585449d77da3a9bf052657ac4ad *electron-v22.3.14-win32-ia32.zip
+41ce6c3d87c89f6b48aac74649657a120c28c78513908996dc20e57a640d4653 *electron-v22.3.14-win32-x64-pdb.zip
+57b35bfa186b64a9dd1eb2bb85141bb998d0378bb20ac8038718b41d16deb978 *electron-v22.3.14-win32-x64-symbols.zip
+f45eba3faa7e10fb1c6e5cf044dd42733a7c8cb455de57647b74e7510b0b94b6 *electron-v22.3.14-win32-x64.zip
+16a75de6e3e4643589237e6e1c680c43b4e77fe04918bfbe4408775b7e616afc *ffmpeg-v22.3.14-darwin-arm64.zip
+92db0c163c326d33a516ebfc56c7bd4faae9456f4238dde916c580b459b8dc8d *ffmpeg-v22.3.14-darwin-x64.zip
+59d2e2b2f2cc515a86a4e0cfd1116d10a8b25a8d58d45bb04de3512e156c944b *ffmpeg-v22.3.14-linux-arm64.zip
+b9d3b227bee17666d395ee7882ef477a733c3eeef3f1d9f2e3616d2d02eb3376 *ffmpeg-v22.3.14-linux-armv7l.zip
+fa07ef910b23a4ef4b6761bc16d20c0e70ff0259325c4d523129e2d9c5084174 *ffmpeg-v22.3.14-linux-x64.zip
+7f744b657ae7c26f80cae0f2771a00edd368350229b85118a246573987dd6ff1 *ffmpeg-v22.3.14-win32-arm64.zip
+562e04d2cf1c970b6128d66d08dfe8d88a28e54adf599293eee2bd6c292fd16b *ffmpeg-v22.3.14-win32-ia32.zip
+f69510384ef912fd9b4961f97357789a4a36e8df6ff382aeeab23fbb063def9a *ffmpeg-v22.3.14-win32-x64.zip

build/lib/tsb/transpiler.js

@@ -381,7 +381,10 @@ export class SwcTranspiler implements ITranspiler {
 			minify: {
 				compress: false,
 				mangle: false
-			}
+			},
+			transform: {
+				useDefineForClassFields: false,
+			},
 		},
 		module: {
 			type: 'amd',

build/lib/tsb/transpiler.ts

@@ -26,7 +26,7 @@ SetupIconFile={#RepoDir}\resources\win32\code.ico
 UninstallDisplayIcon={app}\{#ExeBasename}.exe
 ChangesEnvironment=true
 ChangesAssociations=true
-MinVersion=6.2
+MinVersion=10.0
 SourceDir={#SourceDir}
 AppVersion={#Version}
 VersionInfoVersion={#RawVersion}

build/win32/code.iss

@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "047f474eabcbffc85cca8bb0fdbe8650afa5bf33"
+					"commitHash": "4ade2a6fb65e4b723feb7c09a5df765e5006b378"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "22.3.13"
+			"version": "22.3.14"
 		},
 		{
 			"component": {

cgmanifest.json

@@ -194,7 +194,7 @@ window.addEventListener('message', async event => {
 			const root = document.querySelector('.markdown-body')!;
 
 			const parser = new DOMParser();
-			const newContent = parser.parseFromString(data.content, 'text/html');
+			const newContent = parser.parseFromString(data.content, 'text/html'); // CodeQL [SM03712] This renderers content from the workspace into the Markdown preview. Webviews (and the markdown preview) have many other security measures in place to make this safe
 
 			// Strip out meta http-equiv tags
 			for (const metaElement of Array.from(newContent.querySelectorAll('meta'))) {

extensions/markdown-language-features/preview-src/index.ts

@@ -261,7 +261,7 @@ function escapeHtmlAttribute(attr: string): string {
 
 function escapeMarkdownLinkPath(mdPath: string): string {
 	if (needsBracketLink(mdPath)) {
-		return '<' + mdPath.replace('<', '\\<').replace('>', '\\>') + '>';
+		return '<' + mdPath.replaceAll('<', '\\<').replaceAll('>', '\\>') + '>';
 	}
 
 	return encodeURI(mdPath);

extensions/markdown-language-features/src/languageFeatures/copyFiles/shared.ts

@@ -23,6 +23,7 @@ import { Logger } from './logging/logger';
 import { getPackageInfo } from './utils/packageInfo';
 import { isWebAndHasSharedArrayBuffers } from './utils/platform';
 import { PluginManager } from './tsServer/plugins';
+import { Disposable } from './utils/dispose';
 
 class StaticVersionProvider implements ITypeScriptVersionProvider {
 
@@ -96,13 +97,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<Api> {
 	});
 
 	context.subscriptions.push(lazilyActivateClient(lazyClientHost, pluginManager, activeJsTsEditorTracker, async () => {
-		await preload(logger);
+		await startPreloadWorkspaceContentsIfNeeded(context, logger);
 	}));
 
 	return getExtensionApi(onCompletionAccepted.event, pluginManager);
 }
 
-async function preload(logger: Logger): Promise<void> {
+async function startPreloadWorkspaceContentsIfNeeded(context: vscode.ExtensionContext, logger: Logger): Promise<void> {
 	if (!isWebAndHasSharedArrayBuffers()) {
 		return;
 	}
@@ -113,15 +114,46 @@ async function preload(logger: Logger): Promise<void> {
 		return;
 	}
 
-	try {
-		const remoteHubApi = await RemoteRepositories.getApi();
-		if (await remoteHubApi.loadWorkspaceContents?.(workspaceUri)) {
-			logger.info(`Successfully loaded workspace content for repository ${workspaceUri.toString()}`);
-		} else {
-			logger.info(`Failed to load workspace content for repository ${workspaceUri.toString()}`);
+	const loader = new RemoteWorkspaceContentsPreloader(workspaceUri, logger);
+	context.subscriptions.push(loader);
+	return loader.triggerPreload();
+}
+
+class RemoteWorkspaceContentsPreloader extends Disposable {
+
+	private _preload: Promise<void> | undefined;
+
+	constructor(
+		private readonly workspaceUri: vscode.Uri,
+		private readonly logger: Logger,
+	) {
+		super();
+
+		const fsWatcher = this._register(vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(workspaceUri, '*')));
+		this._register(fsWatcher.onDidChange(uri => {
+			if (uri.toString() === workspaceUri.toString()) {
+				this._preload = undefined;
+				this.triggerPreload();
+			}
+		}));
+	}
+
+	async triggerPreload() {
+		this._preload ??= this.doPreload();
+		return this._preload;
+	}
+
+	private async doPreload(): Promise<void> {
+		try {
+			const remoteHubApi = await RemoteRepositories.getApi();
+			if (await remoteHubApi.loadWorkspaceContents?.(this.workspaceUri)) {
+				this.logger.info(`Successfully loaded workspace content for repository ${this.workspaceUri.toString()}`);
+			} else {
+				this.logger.info(`Failed to load workspace content for repository ${this.workspaceUri.toString()}`);
+			}
+		} catch (error) {
+			this.logger.info(`Loading workspace content for repository ${this.workspaceUri.toString()} failed: ${error instanceof Error ? error.toString() : 'Unknown reason'}`);
+			console.error(error);
 		}
-	} catch (error) {
-		logger.info(`Loading workspace content for repository ${workspaceUri.toString()} failed: ${error instanceof Error ? error.toString() : 'Unknown reason'}`);
-		console.error(error);
 	}
 }

extensions/typescript-language-features/src/extension.browser.ts

@@ -103,7 +103,7 @@ class JsDocCompletionProvider implements vscode.CompletionItemProvider {
 export function templateToSnippet(template: string): vscode.SnippetString {
 	// TODO: use append placeholder
 	let snippetIndex = 1;
-	template = template.replace(/\$/g, '\\$');
+	template = template.replace(/\$/g, '\\$'); // CodeQL [SM02383] This is only used for text which is put into the editor. It is not for rendered html
 	template = template.replace(/^[ \t]*(?=(\/|[ ]\*))/gm, '');
 	template = template.replace(/^(\/\*\*\s*\*[ ]*)$/m, (x) => x + `\$0`);
 	template = template.replace(/\* @param([ ]\{\S+\})?\s+(\S+)[ \t]*$/gm, (_param, type, post) => {