Merge branch 'main' into tyriar/node-pty-39

Author: anthonykim1

.npmrc

@@ -1,6 +1,6 @@
 disturl="https://electronjs.org/headers"
 target="39.2.3"
-ms_build_id="12869810"
+ms_build_id="12895514"
 runtime="electron"
 build_from_source="true"
 legacy-peer-deps="true"

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

@@ -159,6 +159,7 @@
 		"--vscode-editor-foldPlaceholderForeground",
 		"--vscode-editor-foreground",
 		"--vscode-editor-hoverHighlightBackground",
+		"--vscode-editor-inactiveLineHighlightBackground",
 		"--vscode-editor-inactiveSelectionBackground",
 		"--vscode-editor-inlineValuesBackground",
 		"--vscode-editor-inlineValuesForeground",
@@ -303,9 +304,9 @@
 		"--vscode-editorOverviewRuler-background",
 		"--vscode-editorOverviewRuler-border",
 		"--vscode-editorOverviewRuler-bracketMatchForeground",
+		"--vscode-editorOverviewRuler-commentDraftForeground",
 		"--vscode-editorOverviewRuler-commentForeground",
 		"--vscode-editorOverviewRuler-commentUnresolvedForeground",
-		"--vscode-editorOverviewRuler-commentDraftForeground",
 		"--vscode-editorOverviewRuler-commonContentForeground",
 		"--vscode-editorOverviewRuler-currentContentForeground",
 		"--vscode-editorOverviewRuler-deletedForeground",
@@ -345,7 +346,6 @@
 		"--vscode-editorWarning-background",
 		"--vscode-editorWarning-border",
 		"--vscode-editorWarning-foreground",
-		"--vscode-editorWatermark-foreground",
 		"--vscode-editorWhitespace-foreground",
 		"--vscode-editorWidget-background",
 		"--vscode-editorWidget-border",

extensions/git/package.json

@@ -3508,7 +3508,7 @@
         "git.detectWorktreesLimit": {
           "type": "number",
           "scope": "resource",
-          "default": 10,
+          "default": 50,
           "description": "%config.detectWorktreesLimit%"
         },
         "git.alwaysShowStagedChangesResourceGroup": {

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
-  "version": "1.107.0",
-  "distro": "f7daaf68414ef6e47bec698f8babc297f0d90f0d",
+  "version": "1.108.0",
+  "distro": "ac62b183885af851634b215f084a75e84d439948",
   "author": {
     "name": "Microsoft Corporation"
   },

package.json

@@ -8,6 +8,7 @@
 	height: 100%;
 	width: 100%;
 	white-space: nowrap;
+	overflow: hidden;
 }
 
 .monaco-list.mouse-support {

src/vs/base/browser/ui/codicons/codicon/codicon.ttf

@@ -283,6 +283,10 @@ export class ToolBar extends Disposable {
 			return;
 		}
 
+		// Ensure that the container width respects the minimum width of the
+		// element which is set based on the `responsiveBehavior.minItems` option
+		containerWidth = Math.max(containerWidth, parseInt(this.element.style.minWidth));
+
 		// Each action is assumed to have a minimum width so that actions with a label
 		// can shrink to the action's minimum width. We do this so that action visibility
 		// takes precedence over the action label.

src/vs/base/browser/ui/list/list.css

@@ -617,7 +617,6 @@ export const codiconsLibrary = {
 	cursor: register('cursor', 0xec5c),
 	eraser: register('eraser', 0xec5d),
 	fileText: register('file-text', 0xec5e),
-	gitLens: register('git-lens', 0xec5f),
 	quotes: register('quotes', 0xec60),
 	rename: register('rename', 0xec61),
 	runWithDeps: register('run-with-deps', 0xec62),
@@ -644,4 +643,7 @@ export const codiconsLibrary = {
 	clockface: register('clockface', 0xec75),
 	unarchive: register('unarchive', 0xec76),
 	sessionInProgress: register('session-in-progress', 0xec77),
+	collectionSmall: register('collection-small', 0xec78),
+	vmSmall: register('vm-small', 0xec79),
+	cloudSmall: register('cloud-small', 0xec7a),
 } as const;

src/vs/base/browser/ui/toolbar/toolbar.ts

@@ -12,8 +12,8 @@ export namespace Iterable {
 	}
 
 	const _empty: Iterable<never> = Object.freeze([]);
-	export function empty<T = never>(): Iterable<T> {
-		return _empty as Iterable<T>;
+	export function empty<T = never>(): readonly never[] {
+		return _empty as readonly never[];
 	}
 
 	export function* single<T>(element: T): Iterable<T> {