Merge branch 'main' into aiday/issue157165

Author: aiday-mar

.vscode/launch.json

@@ -468,10 +468,9 @@
 			"type": "node",
 			"request": "launch",
 			"name": "Launch Smoke Test",
-			"program": "${workspaceFolder}/test/smoke/out/main.js",
+			"program": "${workspaceFolder}/test/smoke/test/index.js",
 			"cwd": "${workspaceFolder}/test/smoke",
 			"timeout": 240000,
-			"port": 9999,
 			"args": [
 				"-l",
 				"${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Electron"

build/lib/compilation.js

@@ -219,7 +219,7 @@ function generateApiProposalNames() {
             '// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.',
             '',
             'export const allApiProposals = Object.freeze({',
-            `${names.map(name => `\t${name}: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${name}.d.ts'`).join(`,${os.EOL}`)}`,
+            `${names.map(name => `\t${name}: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${name}.d.ts'`).join(`,${eol}`)}`,
             '});',
             'export type ApiProposalName = keyof typeof allApiProposals;',
             '',

build/lib/compilation.ts

@@ -260,7 +260,7 @@ function generateApiProposalNames() {
 				'// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.',
 				'',
 				'export const allApiProposals = Object.freeze({',
-				`${names.map(name => `\t${name}: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${name}.d.ts'`).join(`,${os.EOL}`)}`,
+				`${names.map(name => `\t${name}: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.${name}.d.ts'`).join(`,${eol}`)}`,
 				'});',
 				'export type ApiProposalName = keyof typeof allApiProposals;',
 				'',

build/lib/util.ts

@@ -207,8 +207,8 @@ export function loadSourcemaps(): NodeJS.ReadWriteStream {
 			const contents = (<Buffer>f.contents).toString('utf8');
 
 			const reg = /\/\/# sourceMappingURL=(.*)$/g;
-			let lastMatch: RegExpMatchArray | null = null;
-			let match: RegExpMatchArray | null = null;
+			let lastMatch: RegExpExecArray | null = null;
+			let match: RegExpExecArray | null = null;
 
 			while (match = reg.exec(contents)) {
 				lastMatch = match;

extensions/git/src/git.ts

@@ -427,7 +427,7 @@ export class Git {
 			let previousProgress = 0;
 
 			lineStream.on('data', (line: string) => {
-				let match: RegExpMatchArray | null = null;
+				let match: RegExpExecArray | null = null;
 
 				if (match = /Counting objects:\s*(\d+)%/i.exec(line)) {
 					totalProgress = Math.floor(parseInt(match[1]) * 0.1);

extensions/image-preview/media/audioPreview.css

@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+html, body {
+	width: 100%;
+	height: 100%;
+	text-align: center;
+}
+
+body {
+	padding: 5px 10px;
+	box-sizing: border-box;
+	-webkit-user-select: none;
+	user-select: none;
+}
+
+.audio-container {
+	height: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.container.loading,
+.container.error {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.loading-indicator {
+	width: 30px;
+	height: 30px;
+	background-image: url('./loading.svg');
+	background-size: cover;
+}
+
+.loading-indicator,
+.loading-error {
+	display: none;
+}
+
+.loading .loading-indicator,
+.error .loading-error {
+	display: block;
+}
+
+.loading-error {
+	margin: 1em;
+}
+
+.vscode-dark .loading-indicator {
+	background-image: url('./loading-dark.svg');
+}
+
+.vscode-high-contrast .loading-indicator {
+	background-image: url('./loading-hc.svg');
+}

extensions/image-preview/media/audioPreview.js

@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// @ts-check
+"use strict";
+
+(function () {
+	const vscode = acquireVsCodeApi();
+
+	function getSettings() {
+		const element = document.getElementById('settings');
+		if (element) {
+			const data = element.getAttribute('data-settings');
+			if (data) {
+				return JSON.parse(data);
+			}
+		}
+
+		throw new Error(`Could not load settings`);
+	}
+
+	const settings = getSettings();
+
+	// State
+	let hasLoadedMedia = false;
+
+	// Elements
+	const container = document.createElement('div');
+	container.className = 'audio-container';
+	document.body.appendChild(container);
+
+	const audio = new Audio(settings.src);
+	audio.controls = true;
+
+	audio.addEventListener('error', e => {
+		if (hasLoadedMedia) {
+			return;
+		}
+
+		hasLoadedMedia = true;
+		document.body.classList.add('error');
+		document.body.classList.remove('loading');
+	});
+
+	audio.addEventListener('canplaythrough', () => {
+		if (hasLoadedMedia) {
+			return;
+		}
+		hasLoadedMedia = true;
+
+		document.body.classList.remove('loading');
+		document.body.classList.add('ready');
+		container.append(audio);
+	});
+
+	document.querySelector('.open-file-link').addEventListener('click', () => {
+		vscode.postMessage({
+			type: 'reopen-as-text',
+		});
+	});
+}());

extensions/image-preview/media/main.css renamed to extensions/image-preview/media/imagePreview.css

@@ -22,7 +22,8 @@
   "activationEvents": [
     "onCustomEditor:imagePreview.previewEditor",
     "onCommand:imagePreview.zoomIn",
-    "onCommand:imagePreview.zoomOut"
+    "onCommand:imagePreview.zoomOut",
+    "onCustomEditor:vscode.mediaPreview.audioView"
   ],
   "capabilities": {
     "virtualWorkspaces": true,
@@ -41,6 +42,16 @@
             "filenamePattern": "*.{jpg,jpe,jpeg,png,bmp,gif,ico,webp,avif}"
           }
         ]
+      },
+      {
+        "viewType": "vscode.mediaPreview.audioView",
+        "displayName": "%customEditors.displayName%",
+        "priority": "builtin",
+        "selector": [
+          {
+            "filenamePattern": "*.{mp3,wav,opus,aac}"
+          }
+        ]
       }
     ],
     "commands": [