[pull] main from microsoft:main

.vscode/tasks.json

@@ -21,10 +21,6 @@
 			"windows": {
 				"command": ".\\scripts\\code.bat"
 			},
-			"args": [
-				"--user-data-dir=${workspaceFolder}/.profile-oss",
-				"--extensions-dir=${workspaceFolder}/.profile-oss/extensions"
-			],
 			"inAgents": true,
 			"problemMatcher": []
 		},

build/azure-pipelines/product-quality-checks.yml

@@ -155,7 +155,7 @@ jobs:
         inputs:
           outputfile: $(Build.SourcesDirectory)/ThirdPartyNotices.generated.txt
         retryCountOnTaskFailure: 3
-        timeoutInMinutes: 15
+        timeoutInMinutes: 20
         continueOnError: true
         condition: and(succeeded(), eq(lower(variables['VSCODE_CIBUILD']), 'false'))
 

build/lib/i18n.resources.json

@@ -235,7 +235,7 @@
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/styleOverrides",
+			"name": "vs/workbench/contrib/modernUI",
 			"project": "vscode-workbench"
 		},
 		{

build/lib/policies/policyData.jsonc

@@ -790,7 +790,7 @@
                 }
             },
             "type": "number",
-            "default": 2,
+            "default": 12,
             "included": true
         },
         {

build/lib/stylelint/validateHasSelectors.ts

@@ -52,7 +52,7 @@ interface StylesheetScanResult {
 /**
  * Whether a selector contains a `:has()` attached to a compound that anchors on
  * `body`, `html`, `:root` or `.monaco-workbench` - complete tokens only, at any
- * position within the compound (`.style-override.monaco-workbench:has()` counts,
+ * position within the compound (`.modern-ui.monaco-workbench:has()` counts,
  * `.monaco-workbench .foo:has()` and `.monaco-workbench-like:has()` do not).
  * Such rules make DOM mutations anywhere pay workbench-wide style invalidation
  * (microsoft/vscode#324985).

build/lib/test/rootAnchoredHas.test.ts

@@ -12,7 +12,7 @@ suite('stylelint root-anchored :has() check', () => {
 	test('flags root anchors regardless of position in the compound', () => {
 		assert.ok(containsRootAnchoredHas('body:has(.automation-dialog) .context-view.monaco-component'));
 		assert.ok(containsRootAnchoredHas('.monaco-workbench.floating-panels:has(.part.activitybar.compact) .part.statusbar'));
-		assert.ok(containsRootAnchoredHas('.style-override.monaco-workbench:has(.part.sidebar) .part'));
+		assert.ok(containsRootAnchoredHas('.modern-ui.monaco-workbench:has(.part.sidebar) .part'));
 		assert.ok(containsRootAnchoredHas('BODY:HAS(.foo)'));
 		assert.ok(containsRootAnchoredHas(':root:has(.foo)'));
 		assert.ok(containsRootAnchoredHas(':is(body, .embedded):has(.foo)'));
@@ -29,7 +29,7 @@ suite('stylelint root-anchored :has() check', () => {
 
 	test('ignores :has() anchored below the root', () => {
 		assert.ok(!containsRootAnchoredHas('.monaco-workbench .part > .title:has(.start-debug-action-item) > .title-actions'));
-		assert.ok(!containsRootAnchoredHas('.style-override.monaco-workbench .part:not(.editor):has(> .content)'));
+		assert.ok(!containsRootAnchoredHas('.modern-ui.monaco-workbench .part:not(.editor):has(> .content)'));
 		assert.ok(!containsRootAnchoredHas('.interactive-session .foo:has(.bar)'));
 		assert.ok(!containsRootAnchoredHas('.automations-list-widget .automations-row:has(:focus-visible)'));
 		assert.ok(!containsRootAnchoredHas('.foo:not(.monaco-workbench):has(.bar)'));

extensions/copilot/src/extension/conversation/vscode-node/test/languageModelAccess.test.ts

@@ -11,6 +11,7 @@ import { MockChatMLFetcher } from '../../../../platform/chat/test/common/mockCha
 import { CopilotToken, createTestExtendedTokenInfo } from '../../../../platform/authentication/common/copilotToken';
 import { ICopilotTokenManager } from '../../../../platform/authentication/common/copilotTokenManager';
 import { IAutomodeService } from '../../../../platform/endpoint/node/automodeService';
+import { AutoChatEndpoint } from '../../../../platform/endpoint/node/autoChatEndpoint';
 import { IEndpointProvider } from '../../../../platform/endpoint/common/endpointProvider';
 import { CustomDataPartMimeTypes } from '../../../../platform/endpoint/common/endpointTypes';
 import { CopilotChatEndpoint } from '../../../../platform/endpoint/node/copilotChatEndpoint';
@@ -462,10 +463,11 @@ suite('LanguageModelAccess model info', () => {
 			getCopilotToken: async () => copilotToken,
 			resetCopilotToken: () => { },
 		} as unknown as ICopilotTokenManager);
+		const autoPickerEndpoint = new DeferredPromise<IChatEndpoint>();
 		testingServiceCollection.define(IAutomodeService, {
 			_serviceBrand: undefined,
 			resolveAutoModeEndpoint: async () => lunaEndpoint,
-			resolveAutoModePickerEndpoint: async () => lunaEndpoint,
+			resolveAutoModePickerEndpoint: () => autoPickerEndpoint.p,
 			getAutoPickerMetadata: () => ({ discountRange: { low: 0, high: 0 } }),
 			areAutoModeTiersSupported: () => false,
 			onDidChangeAutoModeTierSupport: Event.None,
@@ -481,10 +483,12 @@ suite('LanguageModelAccess model info', () => {
 			getEmbeddingsEndpoint: async () => { throw new Error('Not implemented in test'); },
 		} as unknown as IEndpointProvider);
 		const accessor = testingServiceCollection.createTestingAccessor();
+		autoPickerEndpoint.complete(accessor.get(IInstantiationService).createInstance(AutoChatEndpoint, lunaEndpoint, '', 0, { low: 0, high: 0 }));
 		const extensionContext = accessor.get(IVSCodeExtensionContext);
 		const version = accessor.get(IEnvService).getVersion();
 		await extensionContext.globalState.update('lmBaseCount/gpt-5.6-luna', { extensionVersion: version, baseCount: 0 });
 		await extensionContext.globalState.update('lmBaseCount/some-hidden-model', { extensionVersion: version, baseCount: 0 });
+		await extensionContext.globalState.update('lmBaseCount/auto', { extensionVersion: version, baseCount: 0 });
 		const languageModelAccess = accessor.get(IInstantiationService).createInstance(LanguageModelAccess);
 		try {
 			const testAccess = languageModelAccess as unknown as {
@@ -527,6 +531,7 @@ suite('LanguageModelAccess model info', () => {
 			languageModelAccess.dispose();
 			await extensionContext.globalState.update('lmBaseCount/gpt-5.6-luna', undefined);
 			await extensionContext.globalState.update('lmBaseCount/some-hidden-model', undefined);
+			await extensionContext.globalState.update('lmBaseCount/auto', undefined);
 		}
 	});
 });

extensions/copilot/src/util/vs/nls.ts

@@ -33,7 +33,7 @@ function _format(message: string, args: (string | number | boolean | undefined |
 		result = message;
 	} else {
 		result = message.replace(/\{(\d+)\}/g, (match, rest) => {
-			const index = rest[0];
+			const index = parseInt(rest, 10);
 			const arg = args[index];
 			let result = match;
 			if (typeof arg === 'string') {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.135.0",
-  "distro": "c125b2a2432ff78b2d1f7b8ed8b0c67cf3af6187",
+  "distro": "5475972d5042caa842cdccf21488c4d0728ca0c1",
   "author": {
     "name": "Microsoft Corporation"
   },

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

@@ -68,7 +68,7 @@ export interface IContextViewCloseAnimation {
 export const CONTEXT_VIEW_MENU_MOTION_CLASS = 'context-view-menu-motion';
 export const CONTEXT_VIEW_MENU_MOTION_CLOSING_CLASS = 'context-view-menu-motion-closing';
 export const CONTEXT_VIEW_MENU_MOTION_CLOSE_ANIMATION_DURATION = 150;
-export const CONTEXT_VIEW_MENU_MOTION_ANCESTOR_CLASSES = ['style-override', 'monaco-enable-motion'] as const;
+export const CONTEXT_VIEW_MENU_MOTION_ANCESTOR_CLASSES = ['modern-ui', 'monaco-enable-motion'] as const;
 export const CONTEXT_VIEW_CLOSE_ANIMATION_DURATION_VARIABLE = '--vscode-context-view-close-animation-duration';
 export const CONTEXT_VIEW_MENU_MOTION_SHADOW_VARIABLE = '--vscode-context-view-menu-motion-shadow';
 const CONTEXT_VIEW_MENU_MOTION_CLOSE_START_OPACITY_VARIABLE = '--vscode-context-view-menu-motion-close-start-opacity';
@@ -145,7 +145,7 @@ let contextViewMenuMotionStyleSheet: HTMLStyleElement | undefined;
 function ensureContextViewMenuMotionStyleSheet(): void {
 	if (!contextViewMenuMotionStyleSheet) {
 		contextViewMenuMotionStyleSheet = createStyleSheet(undefined, style => {
-			style.textContent = getContextViewMenuMotionCss('.style-override.monaco-enable-motion');
+			style.textContent = getContextViewMenuMotionCss('.modern-ui.monaco-enable-motion');
 		});
 	}
 }
@@ -509,5 +509,5 @@ const SHADOW_ROOT_CSS = /* css */ `
 	:host-context(.linux:lang(zh-Hant)) { font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans TC", "Source Han Sans TW", "Source Han Sans", sans-serif; }
 	:host-context(.linux:lang(ja)) { font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans J", "Source Han Sans JP", "Source Han Sans", sans-serif; }
 	:host-context(.linux:lang(ko)) { font-family: system-ui, "Ubuntu", "Droid Sans", "Source Han Sans K", "Source Han Sans JR", "Source Han Sans", "UnDotum", "FBaekmuk Gulim", sans-serif; }
-	${getContextViewMenuMotionCss(':host-context(.style-override.monaco-enable-motion)')}
+	${getContextViewMenuMotionCss(':host-context(.modern-ui.monaco-enable-motion)')}
 `;

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

@@ -25,6 +25,7 @@ export interface ILabelRenderer {
 export interface IBaseDropdownOptions {
 	label?: string;
 	labelRenderer?: ILabelRenderer;
+	isEnabled?: () => boolean;
 }
 
 export class BaseDropdown extends ActionRunner {
@@ -39,17 +40,17 @@ export class BaseDropdown extends ActionRunner {
 
 	private hover: IManagedHover | undefined;
 
-	constructor(container: HTMLElement, options: IBaseDropdownOptions) {
+	constructor(container: HTMLElement, private readonly baseOptions: IBaseDropdownOptions) {
 		super();
 
 		this._element = append(container, $('.monaco-dropdown'));
 
 		this._label = append(this._element, $('.dropdown-label'));
 
-		let labelRenderer = options.labelRenderer;
+		let labelRenderer = baseOptions.labelRenderer;
 		if (!labelRenderer) {
 			labelRenderer = (container: HTMLElement): IDisposable | null => {
-				container.textContent = options.label || '';
+				container.textContent = baseOptions.label || '';
 
 				return null;
 			};
@@ -61,6 +62,10 @@ export class BaseDropdown extends ActionRunner {
 
 		for (const event of [EventType.MOUSE_DOWN, GestureEventType.Tap]) {
 			this._register(addDisposableListener(this._label, event, e => {
+				if (baseOptions.isEnabled?.() === false) {
+					return;
+				}
+
 				if (isMouseEvent(e) && e.button !== 0) {
 					// prevent right click trigger to allow separate context menu (https://github.com/microsoft/vscode/issues/151064)
 					return;
@@ -79,6 +84,10 @@ export class BaseDropdown extends ActionRunner {
 			if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) {
 				EventHelper.stop(e, true); // https://github.com/microsoft/vscode/issues/57997
 
+				if (baseOptions.isEnabled?.() === false) {
+					return;
+				}
+
 				if (this.visible) {
 					this.hide();
 				} else {
@@ -114,7 +123,7 @@ export class BaseDropdown extends ActionRunner {
 	}
 
 	show(): void {
-		if (!this.visible) {
+		if (!this.visible && this.baseOptions.isEnabled?.() !== false) {
 			this.visible = true;
 			this._onDidChangeVisibility.fire(true);
 		}
@@ -208,6 +217,10 @@ export class DropdownMenu extends BaseDropdown {
 	}
 
 	override show(): void {
+		if (this._options.isEnabled?.() === false) {
+			return;
+		}
+
 		super.show();
 
 		this.element.classList.add('active');

src/vs/base/browser/ui/dropdown/dropdownActionViewItem.ts

@@ -84,6 +84,7 @@ export class DropdownMenuActionViewItem extends BaseActionViewItem {
 		const options: IDropdownMenuOptions = {
 			contextMenuProvider: this.contextMenuProvider,
 			labelRenderer: labelRenderer,
+			isEnabled: () => this.action.enabled,
 			menuAsChild: this.options.menuAsChild,
 			actions: isActionsArray ? this.menuActionsOrProvider as IAction[] : undefined,
 			actionProvider: isActionsArray ? undefined : this.menuActionsOrProvider as IActionProvider,
@@ -183,6 +184,7 @@ export class DropdownMenuActionViewItem extends BaseActionViewItem {
 		const disabled = !this.action.enabled;
 		this.actionItem?.classList.toggle('disabled', disabled);
 		this.element?.classList.toggle('disabled', disabled);
+		this.element?.setAttribute('aria-disabled', String(disabled));
 	}
 }
 
@@ -221,7 +223,7 @@ export class ActionWithDropdownActionViewItem extends ActionViewItem {
 			separator.classList.toggle('prominent', menuActionClassNames.includes('prominent'));
 			append(this.element, separator);
 
-			this.dropdownMenuActionViewItem = this._register(new DropdownMenuActionViewItem(this._register(new Action('dropdownAction', nls.localize('moreActions', "More Actions..."))), menuActionsProvider, this.contextMenuProvider, {
+			this.dropdownMenuActionViewItem = this._register(new DropdownMenuActionViewItem(this._register(new Action('dropdownAction', nls.localize('moreActions', "More Actions..."), undefined, this.action.enabled)), menuActionsProvider, this.contextMenuProvider, {
 				classNames: ['dropdown', ...ThemeIcon.asClassNameArray(Codicon.dropDownButton), ...menuActionClassNames],
 				hoverDelegate: this.options.hoverDelegate,
 				keybindingProvider: (<IActionWithDropdownActionViewItemOptions>this.options).keybindingProvider,
@@ -261,4 +263,11 @@ export class ActionWithDropdownActionViewItem extends ActionViewItem {
 		super.setFocusable(focusable);
 		this.dropdownMenuActionViewItem?.setFocusable(focusable);
 	}
+
+	protected override updateEnabled(): void {
+		super.updateEnabled();
+		if (this.dropdownMenuActionViewItem) {
+			this.dropdownMenuActionViewItem.action.enabled = this.action.enabled;
+		}
+	}
 }

src/vs/base/test/browser/ui/contextview/contextview.test.ts

@@ -47,7 +47,7 @@ suite('ContextView', () => {
 	test('hide() delays render disposal for close animations', () => {
 		const clock = sinon.useFakeTimers();
 		const container = $('.container');
-		container.classList.add('style-override', 'monaco-enable-motion');
+		container.classList.add('modern-ui', 'monaco-enable-motion');
 		const contextView = new ContextView(container, ContextViewDOMPosition.ABSOLUTE);
 
 		let disposeCount = 0;
@@ -61,7 +61,7 @@ suite('ContextView', () => {
 			closeAnimation: {
 				className: 'closing',
 				duration: 100,
-				requiredAncestorClasses: ['style-override', 'monaco-enable-motion']
+				requiredAncestorClasses: ['modern-ui', 'monaco-enable-motion']
 			}
 		};
 
@@ -215,7 +215,7 @@ suite('ContextView', () => {
 
 	test('menu motion does not retain a containing block for submenus (#326248)', () => {
 		const container = $('.container');
-		container.classList.add('style-override', 'monaco-enable-motion');
+		container.classList.add('modern-ui', 'monaco-enable-motion');
 		document.body.appendChild(container);
 
 		const surface = $('.monaco-scrollable-element');

src/vs/base/test/common/nls.test.ts

@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { strictEqual } from 'assert';
+import { localize, localize2 } from '../../../nls.js';
+import { ensureNoDisposablesAreLeakedInTestSuite } from './utils.js';
+
+suite('NLS', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('localize replaces placeholders by index', () => {
+		strictEqual(localize('key0', '{0} {1} {2}', 'a', 'b', 'c'), 'a b c');
+	});
+
+	test('localize replaces multi digit placeholders', () => {
+		const args = ['a0', 'a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'a7', 'a8', 'a9', 'a10', 'a11'];
+		strictEqual(localize('key1', '{0} {1} {9} {10} {11}', ...args), 'a0 a1 a9 a10 a11');
+	});
+
+	test('localize keeps placeholders that are not replaceable', () => {
+		strictEqual(localize('key2', '{0} {1}', 'a', {} as unknown as string), 'a {1}');
+	});
+
+	test('localize2 replaces multi digit placeholders', () => {
+		const args = ['a0', 'a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'a7', 'a8', 'a9', 'a10'];
+		strictEqual(localize2('key3', '{10}', ...args).value, 'a10');
+	});
+});

src/vs/code/electron-utility/sharedProcess/contrib/languagePackCachedDataCleaner.ts

@@ -56,7 +56,10 @@ export class LanguagePackCachedDataCleaner extends Disposable {
 		}
 	}
 
-	private async cleanUpLanguagePackCache(): Promise<void> {
+	/**
+	 * Public for testing.
+	 */
+	async cleanUpLanguagePackCache(): Promise<void> {
 		this.logService.trace('[language pack cache cleanup]: Starting to clean up unused language packs.');
 
 		try {
@@ -89,7 +92,15 @@ export class LanguagePackCachedDataCleaner extends Disposable {
 			const now = Date.now();
 			for (const packEntry of Object.keys(installed)) {
 				const folder = join(cacheDir, packEntry);
-				const entries = await Promises.readdir(folder);
+				let entries: string[];
+				try {
+					entries = await Promises.readdir(folder);
+				} catch (error) {
+					if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
+						continue;
+					}
+					throw error;
+				}
 				for (const entry of entries) {
 					if (entry === 'tcf.json') {
 						continue;