Merge branch 'main' into fix-146732

Author: BABA983

.devcontainer/README.md

@@ -1,6 +1,6 @@
 # Code - OSS Development Container
 
-[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode)
+[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/vscode)
 
 This repository includes configuration for a development container for working with Code - OSS in a local container or using [GitHub Codespaces](https://github.com/features/codespaces).
 

.github/classifier.json

@@ -127,7 +127,7 @@
 		"layout": {"assign": ["benibenj"]},
 		"lcd-text-rendering": {"assign": []},
 		"list-widget": {"assign": ["joaomoreno"]},
-		"live-preview": {"assign": ["andreamah"]},
+		"live-preview": {"assign": []},
 		"log": {"assign": ["sandy081"]},
 		"markdown": {"assign": ["mjbvz"]},
 		"marketplace": {"assign": ["isidorn"]},
@@ -199,9 +199,9 @@
 		"sash-widget": {"assign": ["joaomoreno"]},
 		"scm": {"assign": ["lszomoru"]},
 		"screencast-mode": {"assign": ["joaomoreno"]},
-		"search": {"assign": ["andreamah", "roblourens"]},
-		"search-api": {"assign": ["andreamah", "roblourens"]},
-		"search-editor": {"assign": ["andreamah", "roblourens"]},
+		"search": {"assign": ["roblourens"]},
+		"search-api": {"assign": ["roblourens"]},
+		"search-editor": {"assign": ["roblourens"]},
 		"search-replace": {"assign": ["sandy081"]},
 		"semantic-tokens": {"assign": ["alexdima", "aeschli"]},
 		"server": {"assign": ["alexdima"]},
@@ -215,7 +215,6 @@
 		"snap": {"assign": ["deepak1556"]},
 		"snippets": {"assign": ["jrieken"]},
 		"splitview-widget": {"assign": ["joaomoreno"]},
-		"ssh": {"assign": ["eleanorjboyd"]},
 		"suggest": {"assign": ["jrieken"]},
 		"table-widget": {"assign": ["joaomoreno"]},
 		"tasks": {"assign": ["meganrogge"], "accuracy": 0.85},

.github/commands.yml

@@ -0,0 +1,57 @@
+# Coding Guidelines
+
+## Introduction
+
+These are VS Code coding guidelines. Please also review our [Source Code Organisation](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) page.
+
+## Indentation
+
+We use tabs, not spaces.
+
+## Naming Conventions
+
+* Use PascalCase for `type` names
+* Use PascalCase for `enum` values
+* Use camelCase for `function` and `method` names
+* Use camelCase for `property` names and `local variables`
+* Use whole words in names when possible
+
+## Types
+
+* Do not export `types` or `functions` unless you need to share it across multiple components
+* Do not introduce new `types` or `values` to the global namespace
+
+## Comments
+
+* When there are comments for `functions`, `interfaces`, `enums`, and `classes` use JSDoc style comments
+
+## Strings
+
+* Use "double quotes" for strings shown to the user that need to be externalized (localized)
+* Use 'single quotes' otherwise
+* All strings visible to the user need to be externalized
+
+## Style
+
+* Use arrow functions `=>` over anonymous function expressions
+* Only surround arrow function parameters when necessary. For example, `(x) => x + x` is wrong but the following are correct:
+
+```javascript
+x => x + x
+(x, y) => x + y
+<T>(x: T, y: T) => x === y
+```
+
+* Always surround loop and conditional bodies with curly braces
+* Open curly braces always go on the same line as whatever necessitates them
+* Parenthesized constructs should have no surrounding whitespace. A single space follows commas, colons, and semicolons in those constructs. For example:
+
+```javascript
+for (let i = 0, n = str.length; i < 10; i++) {
+    if (x < 10) {
+        foo();
+    }
+}
+
+function f(x: number, y: string): void { }
+```

.github/copilot-instructions.md

@@ -28,7 +28,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "2.x"
+          python-version: "3.x"
 
       - name: Compute node modules cache key
         id: nodeModulesCacheKey

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
-target="32.1.2"
-ms_build_id="10323173"
+target="32.2.6"
+ms_build_id="10629634"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"

.npmrc

@@ -1 +1 @@
-20.17.0
+20.18.0

.nvmrc

@@ -42,6 +42,16 @@ const extensions = [
 		workspaceFolder: `extensions/vscode-colorize-tests/test`,
 		mocha: { timeout: 60_000 }
 	},
+	{
+		label: 'terminal-suggest',
+		workspaceFolder: path.join(os.tmpdir(), `terminal-suggest-${Math.floor(Math.random() * 100000)}`),
+		mocha: { timeout: 60_000 }
+	},
+	{
+		label: 'vscode-colorize-perf-tests',
+		workspaceFolder: `extensions/vscode-colorize-perf-tests/test`,
+		mocha: { timeout: 6000_000 }
+	},
 	{
 		label: 'configuration-editing',
 		workspaceFolder: path.join(os.tmpdir(), `confeditout-${Math.floor(Math.random() * 100000)}`),

.vscode-test.js

@@ -142,7 +142,7 @@ class ScriptCoverageTracker {
 	}
 }
 
-export class V8CoverageFile extends vscode.FileCoverage2 {
+export class V8CoverageFile extends vscode.FileCoverage {
 	public details: vscode.StatementCoverage[] = [];
 
 	constructor(

.vscode/extensions/vscode-selfhost-test-provider/src/coverageProvider.ts

@@ -86,10 +86,11 @@ export async function activate(context: vscode.ExtensionContext) {
 			}, uri => ctrl.items.get(uri.toString().toLowerCase()));
 		ctrl.relatedCodeProvider = graph;
 
-		context.subscriptions.push(
-			new FailureTracker(context, folder.uri.fsPath),
-			fileChangedEmitter.event(e => graph.didChange(e.uri, e.removed)),
-		);
+		if (context.storageUri) {
+			context.subscriptions.push(new FailureTracker(context.storageUri.fsPath, folder.uri.fsPath));
+		}
+
+		context.subscriptions.push(fileChangedEmitter.event(e => graph.didChange(e.uri, e.removed)));
 	});
 
 	const createRunHandler = (