Merge branch 'main' into fix-context-menu-for-deleted-lines-in-diff-inline

Author: jairbubbles

.configurations/configuration.dsc.yaml

@@ -0,0 +1,67 @@
+# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
+# Reference: https://github.com/microsoft/vscode/wiki/How-to-Contribute
+properties:
+  resources:
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      directives:
+        description: Install Git
+        allowPrerelease: true
+      settings:
+        id: Git.Git
+        source: winget
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: npm
+      directives:
+        description: Install NodeJS version >=16.17.x and <17
+        allowPrerelease: true
+      settings:
+        id: OpenJS.NodeJS.LTS
+        version: "16.20.0"
+        source: winget
+    - resource: NpmDsc/NpmPackage
+      id: yarn
+      dependsOn:
+        - npm
+      directives:
+        description: Install Yarn
+        allowPrerelease: true
+      settings:
+        Name: 'yarn'
+        Global: true
+        PackageDirectory: '${WinGetConfigRoot}\..\'
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      directives:
+        description: Install Python 3.10
+        allowPrerelease: true
+      settings:
+        id: Python.Python.3.10
+        source: winget
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: vsPackage
+      directives:
+        description: Install Visual Studio 2022 (any edition is OK)
+        allowPrerelease: true
+      settings:
+        id: Microsoft.VisualStudio.2022.BuildTools
+        source: winget
+    - resource: Microsoft.VisualStudio.DSC/VSComponents
+      dependsOn:
+        - vsPackage
+      directives:
+        description: Install required VS workloads
+        allowPrerelease: true
+      settings:
+        productId: Microsoft.VisualStudio.Product.BuildTools
+        channelId: VisualStudio.17.Release
+        includeRecommended: true
+        components:
+          - Microsoft.VisualStudio.Workload.VCTools
+    - resource: YarnDsc/YarnInstall
+      dependsOn:
+        - npm
+      directives:
+        description: Install dependencies
+        allowPrerelease: true
+      settings:
+        PackageDirectory: '${WinGetConfigRoot}\..\'
+  configurationVersion: 0.2.0

.github/commands.json

@@ -209,6 +209,14 @@
 		"removeLabel": "~version-info-needed",
 		"comment": "Thanks for creating this issue! We figured it's missing some basic information, such as a version number, or in some other way doesn't follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). Please take the time to review these and update the issue.\n\nHappy Coding!"
 	},
+	{
+		"type": "label",
+		"name": "~confirmation-needed",
+		"action": "updateLabels",
+		"addLabel": "info-needed",
+		"removeLabel": "~confirmation-needed",
+		"comment": "Thanks for creating this issue! To help narrow it down, please take the time to follow below steps. Thanks a lot and happy coding 🙏\n\n### Is the issue caused by an Extension?\nStop VS Code and from the command line (NOT the integrated terminal in Code), execute: `code --disable-extensions` and try your steps again to see if it reproduces. If it still reproduces, jump to the next chapter.\n\nIf you see it is an issue with the extension, please run the command `Start Extension Bisect` and follow the instructions to find the extension that is causing this issue.\n\n<img width='631' alt='image' src='https://user-images.githubusercontent.com/900690/228760008-d5790ad1-74da-46a2-917f-e1bd26281ca8.png'>\n\nPlease report the issue to the extension causing this.\n\n### Is the issue caused by VS Code Core?\nIf the issue is not caused by an extension, it is maybe caused by your configuration. Try to run `code --disable-extensions --user-data-dir <directory>` where `<directory>` is an empty folder. This will ensure Code is starting with a fresh data directory, e.g. no specific settings and without any extensions running.\n\nIf it still reproduces, it was maybe fixed already in our nightly release. Please download from https://code.visualstudio.com/insiders/ and see if you can reproduce the issue.\n\nFinally, to help us narrow down what change caused the issue, please run the following command to find the build. It will start previous releases of VS Code insiders to see where the regression was introduced:\n* `npx --yes vscode-bisect@latest`\n* follow the instructions until you found the offending build\n* report back the commit range in this issue\n\nThanks!"
+	},
 	{
 		"type": "comment",
 		"name": "a11ymas",
@@ -467,6 +475,19 @@
 		"addLabel": "info-needed",
 		"comment": "Thanks for reporting this issue! Unfortunately, it's hard for us to understand what issue you're seeing. Please help us out by providing a screen recording showing exactly what isn't working as expected. While we can work with most standard formats, `.gif` files are preferred as they are displayed inline on GitHub. You may find https://gifcap.dev helpful as a browser-based gif recording tool.\n\nIf the issue depends on keyboard input, you can help us by enabling screencast mode for the recording (`Developer: Toggle Screencast Mode` in the command palette). Lastly, please attach this file via the GitHub web interface as emailed responses will strip files out from the issue.\n\nHappy coding!"
 	},
+	{
+		"type": "comment",
+		"name": "confirmPlease",
+		"allowUsers": [
+			"cleidigh",
+			"usernamehw",
+			"gjsjohnmurray",
+			"IllusionMH"
+		],
+		"action": "comment",
+		"addLabel": "info-needed",
+		"comment": "Thanks for creating this issue! To help narrow it down, please take the time to follow below steps. Thanks a lot and happy coding 🙏\n\n### Is the issue caused by an Extension?\nStop VS Code and from the command line (NOT the integrated terminal in Code), execute: `code --disable-extensions` and try your steps again to see if it reproduces. If it still reproduces, jump to the next chapter.\n\nIf you see it is an issue with the extension, please run the command `Start Extension Bisect` and follow the instructions to find the extension that is causing this issue.\n\n<img width='631' alt='image' src='https://user-images.githubusercontent.com/900690/228760008-d5790ad1-74da-46a2-917f-e1bd26281ca8.png'>\n\nPlease report the issue to the extension causing this.\n\n### Is the issue caused by VS Code Core?\nIf the issue is not caused by an extension, it is maybe caused by your configuration. Try to run `code --disable-extensions --user-data-dir <directory>` where `<directory>` is an empty folder. This will ensure Code is starting with a fresh data directory, e.g. no specific settings and without any extensions running.\n\nIf it still reproduces, it was maybe fixed already in our nightly release. Please download from https://code.visualstudio.com/insiders/ and see if you can reproduce the issue.\n\nFinally, to help us narrow down what change caused the issue, please run the following command to find the build. It will start previous releases of VS Code insiders to see where the regression was introduced:\n* `npx --yes vscode-bisect@latest`\n* follow the instructions until you found the offending build\n* report back the commit range in this issue\n\nThanks!"
+	},
 	{
 		"__comment__": "Allows folks on the team to label issues by commenting: `\\label My-Label` ",
 		"type": "comment",

.yarnrc

@@ -1,4 +1,4 @@
 disturl "https://electronjs.org/headers"
-target "22.3.5"
+target "22.3.10"
 runtime "electron"
 build_from_source "true"

build/lib/electron.js

@@ -91,7 +91,7 @@ function darwinBundleDocumentTypes(types: { [name: string]: string | string[] },
 }
 
 export const config = {
-	version: product.electronRepository ? '22.5.2' : util.getElectronVersion(),
+	version: product.electronRepository ? '22.5.3' : util.getElectronVersion(),
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
 	copyright: 'Copyright (C) 2023 Microsoft. All rights reserved',
@@ -212,7 +212,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 }
 
 async function main(arch = process.arch): Promise<void> {
-	const version = product.electronRepository ? '22.5.2' : util.getElectronVersion();
+	const version = product.electronRepository ? '22.5.3' : util.getElectronVersion();
 	const electronPath = path.join(root, '.build', 'electron');
 	const versionFile = path.join(electronPath, 'version');
 	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;

build/lib/electron.ts

@@ -290,6 +290,10 @@
 			"name": "vs/workbench/contrib/welcomeWalkthrough",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/welcomeDialog",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/outline",
 			"project": "vscode-workbench"
@@ -322,10 +326,6 @@
 			"name": "vs/workbench/contrib/bracketPairColorizer2Telemetry",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/contrib/offline",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/contrib/remoteTunnel",
 			"project": "vscode-workbench"
@@ -514,6 +514,10 @@
 			"name": "vs/workbench/services/localization",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/share",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/accessibility",
 			"project": "vscode-workbench"

build/lib/i18n.resources.json

@@ -51,6 +51,8 @@
 		"--vscode-commandCenter-foreground",
 		"--vscode-commandCenter-inactiveBorder",
 		"--vscode-commandCenter-inactiveForeground",
+		"--vscode-commentsView-resolvedIcon",
+		"--vscode-commentsView-unresolvedIcon",
 		"--vscode-contrastActiveBorder",
 		"--vscode-contrastBorder",
 		"--vscode-debugConsole-errorForeground",
@@ -97,6 +99,7 @@
 		"--vscode-diffEditor-removedLineBackground",
 		"--vscode-diffEditor-removedTextBackground",
 		"--vscode-diffEditor-removedTextBorder",
+		"--vscode-diffEditor-unchangedRegionBackground",
 		"--vscode-diffEditorGutter-insertedLineBackground",
 		"--vscode-diffEditorGutter-removedLineBackground",
 		"--vscode-diffEditorOverview-insertedForeground",
@@ -233,6 +236,8 @@
 		"--vscode-editorOverviewRuler-background",
 		"--vscode-editorOverviewRuler-border",
 		"--vscode-editorOverviewRuler-bracketMatchForeground",
+		"--vscode-editorOverviewRuler-commentForeground",
+		"--vscode-editorOverviewRuler-commentUnresolvedForeground",
 		"--vscode-editorOverviewRuler-commonContentForeground",
 		"--vscode-editorOverviewRuler-currentContentForeground",
 		"--vscode-editorOverviewRuler-deletedForeground",
@@ -309,6 +314,8 @@
 		"--vscode-interactiveEditor-border",
 		"--vscode-interactiveEditor-regionHighlight",
 		"--vscode-interactiveEditor-shadow",
+		"--vscode-interactiveEditorDiff-inserted",
+		"--vscode-interactiveEditorDiff-removed",
 		"--vscode-interactiveEditorInput-background",
 		"--vscode-interactiveEditorInput-border",
 		"--vscode-interactiveEditorInput-focusBorder",
@@ -519,6 +526,8 @@
 		"--vscode-statusBar-noFolderBackground",
 		"--vscode-statusBar-noFolderBorder",
 		"--vscode-statusBar-noFolderForeground",
+		"--vscode-statusBar-offlineBackground",
+		"--vscode-statusBar-offlineForeground",
 		"--vscode-statusBarItem-activeBackground",
 		"--vscode-statusBarItem-compactHoverBackground",
 		"--vscode-statusBarItem-errorBackground",
@@ -692,6 +701,8 @@
 		"--tab-border-top-color",
 		"--tab-dirty-border-top-color",
 		"--tabs-border-bottom-color",
+		"--tab-sizing-current-width",
+		"--tab-sizing-fixed-max-width",
 		"--testMessageDecorationFontFamily",
 		"--testMessageDecorationFontSize",
 		"--title-border-bottom-color",
@@ -730,4 +741,4 @@
 		"--z-index-run-button-container",
 		"--zoom-factor"
 	]
-}
+}

build/lib/stylelint/vscode-known-variables.json

@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "0b17a201195ae6445e11cee50e436a3511717600"
+					"commitHash": "b07f2f0f42a1483cd2e5ec8fa3c77ebaa0507069"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "22.3.5"
+			"version": "22.3.10"
 		},
 		{
 			"component": {

cgmanifest.json

@@ -611,6 +611,7 @@ async fn handle_serve(
 ) -> Result<EmptyObject, AnyError> {
 	// fill params.extensions into code_server_args.install_extensions
 	let mut csa = c.code_server_args.clone();
+	csa.connection_token = params.connection_token;
 	csa.install_extensions.extend(params.extensions.into_iter());
 
 	let params_raw = ServerParamsRaw {
@@ -1034,8 +1035,7 @@ async fn handle_spawn_cli(
 
 	// CLI args to spawn a server; contracted with clients that they should _not_ provide these.
 	p.arg("--verbose");
-	p.arg("tunnel");
-	p.arg("stdio");
+	p.arg("command-shell");
 
 	p.envs(&params.env);
 	p.stdin(Stdio::piped());

cli/src/tunnels/control_server.rs

@@ -5,9 +5,9 @@
 
 import { Disposable, commands } from 'vscode';
 import { Model } from '../model';
-import { pickRemoteSource } from '../remoteSource';
+import { getRemoteSourceActions, pickRemoteSource } from '../remoteSource';
 import { GitBaseExtensionImpl } from './extension';
-import { API, PickRemoteSourceOptions, PickRemoteSourceResult, RemoteSourceProvider } from './git-base';
+import { API, PickRemoteSourceOptions, PickRemoteSourceResult, RemoteSourceAction, RemoteSourceProvider } from './git-base';
 
 export class ApiImpl implements API {
 
@@ -17,6 +17,10 @@ export class ApiImpl implements API {
 		return pickRemoteSource(this._model, options as any);
 	}
 
+	getRemoteSourceActions(url: string): Promise<RemoteSourceAction[]> {
+		return getRemoteSourceActions(this._model, url);
+	}
+
 	registerRemoteSourceProvider(provider: RemoteSourceProvider): Disposable {
 		return this._model.registerRemoteSourceProvider(provider);
 	}