Merge branch 'main' into dbaeumer/glad-guineafowl-lime

Author: dbaeumer

src/vs/editor/common/textModelEditReason.ts

@@ -64,7 +64,7 @@ export const EditReasons = {
 	chatApplyEdits(data: { modelId: string | undefined }) {
 		return createEditReason({
 			source: 'Chat.applyEdits',
-			$modelId: data.modelId,
+			$modelId: avoidPathRedaction(data.modelId),
 		} as const);
 	},
 
@@ -90,7 +90,7 @@ export const EditReasons = {
 	inlineChatApplyEdit(data: { modelId: string | undefined }) {
 		return createEditReason({
 			source: 'inlineChat.applyEdits',
-			$modelId: avoidRedaction(data.modelId),
+			$modelId: avoidPathRedaction(data.modelId),
 		} as const);
 	},
 
@@ -116,7 +116,7 @@ export const EditReasons = {
 type Values<T> = T[keyof T];
 type ITextModelEditReasonMetadata = Values<{ [TKey in keyof typeof EditReasons]: ReturnType<typeof EditReasons[TKey]>['metadataT'] }>;
 
-function avoidRedaction(str: string | undefined): string | undefined {
+function avoidPathRedaction(str: string | undefined): string | undefined {
 	if (str === undefined) {
 		return undefined;
 	}

src/vs/workbench/contrib/chat/browser/actions/chatActions.ts

@@ -819,9 +819,9 @@ export function registerChatActions() {
 	registerAction2(class UpdateInstructionsAction extends Action2 {
 		constructor() {
 			super({
-				id: 'workbench.action.chat.updateInstructions',
-				title: localize2('updateInstructions', "Generate Instructions"),
-				shortTitle: localize2('updateInstructions.short', "Generate Instructions"),
+				id: 'workbench.action.chat.generateInstructions',
+				title: localize2('generateInstructions', "Generate Workspace Instructions File"),
+				shortTitle: localize2('generateInstructions.short', "Generate Instructions"),
 				category: CHAT_CATEGORY,
 				icon: Codicon.sparkle,
 				f1: true,

src/vs/workbench/contrib/chat/browser/actions/chatContextActions.ts

@@ -114,6 +114,7 @@ class AttachFileToChatAction extends AttachResourceAction {
 			id: AttachFileToChatAction.ID,
 			title: localize2('workbench.action.chat.attachFile.label', "Add File to Chat"),
 			category: CHAT_CATEGORY,
+			precondition: ChatContextKeys.enabled,
 			f1: true,
 			menu: [{
 				id: MenuId.SearchContext,
@@ -224,6 +225,7 @@ class AttachSelectionToChatAction extends Action2 {
 			title: localize2('workbench.action.chat.attachSelection.label', "Add Selection to Chat"),
 			category: CHAT_CATEGORY,
 			f1: true,
+			precondition: ChatContextKeys.enabled,
 			menu: {
 				id: MenuId.ChatTextEditorMenu,
 				group: 'zContext',

src/vs/workbench/contrib/chat/browser/actions/chatLanguageModelActions.ts

@@ -17,6 +17,7 @@ import { IExtensionsWorkbenchService } from '../../../extensions/common/extensio
 import { IProductService } from '../../../../../platform/product/common/productService.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
+import { ChatContextKeys } from '../../common/chatContextKeys.js';
 
 class ManageLanguageModelAuthenticationAction extends Action2 {
 	static readonly ID = 'workbench.action.chat.manageLanguageModelAuthentication';
@@ -26,6 +27,7 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
 			id: ManageLanguageModelAuthenticationAction.ID,
 			title: localize2('manageLanguageModelAuthentication', 'Manage Language Model Access...'),
 			category: CHAT_CATEGORY,
+			precondition: ChatContextKeys.enabled,
 			menu: [{
 				id: MenuId.AccountsContext,
 				order: 100,

src/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers.ts

@@ -130,7 +130,7 @@ const UPDATE_INSTRUCTIONS_OPTION: IPromptPickerQuickPickItem = Object.freeze({
 	pickable: false,
 	alwaysShow: true,
 	buttons: [HELP_BUTTON],
-	commandId: 'workbench.action.chat.updateInstructions',
+	commandId: 'workbench.action.chat.generateInstructions',
 });
 
 /**

src/vs/workbench/contrib/terminalContrib/zoom/browser/terminal.zoom.contribution.ts

@@ -57,6 +57,10 @@ class TerminalMouseWheelZoomContribution extends Disposable implements ITerminal
 		return this._configurationService.getValue(TerminalSettingId.FontSize);
 	}
 
+	private _clampFontSize(fontSize: number): number {
+		return clampTerminalFontSize(fontSize);
+	}
+
 	private _setupMouseWheelZoomListener(raw: RawXtermTerminal) {
 		// This is essentially a copy of what we do in the editor, just we modify font size directly
 		// as there is no separate zoom level concept in the terminal
@@ -72,7 +76,8 @@ class TerminalMouseWheelZoomContribution extends Disposable implements ITerminal
 			if (classifier.isPhysicalMouseWheel()) {
 				if (this._hasMouseWheelZoomModifiers(browserEvent)) {
 					const delta = browserEvent.deltaY > 0 ? -1 : 1;
-					this._configurationService.updateValue(TerminalSettingId.FontSize, this._getConfigFontSize() + delta);
+					const newFontSize = this._clampFontSize(this._getConfigFontSize() + delta);
+					this._configurationService.updateValue(TerminalSettingId.FontSize, newFontSize);
 					// EditorZoom.setZoomLevel(zoomLevel + delta);
 					browserEvent.preventDefault();
 					browserEvent.stopPropagation();
@@ -96,7 +101,8 @@ class TerminalMouseWheelZoomContribution extends Disposable implements ITerminal
 					const deltaAbs = Math.ceil(Math.abs(gestureAccumulatedDelta / 5));
 					const deltaDirection = gestureAccumulatedDelta > 0 ? -1 : 1;
 					const delta = deltaAbs * deltaDirection;
-					this._configurationService.updateValue(TerminalSettingId.FontSize, gestureStartFontSize + delta);
+					const newFontSize = this._clampFontSize(gestureStartFontSize + delta);
+					this._configurationService.updateValue(TerminalSettingId.FontSize, newFontSize);
 					gestureAccumulatedDelta += browserEvent.deltaY;
 					browserEvent.preventDefault();
 					browserEvent.stopPropagation();
@@ -128,7 +134,8 @@ registerTerminalAction({
 		const configurationService = accessor.get(IConfigurationService);
 		const value = configurationService.getValue(TerminalSettingId.FontSize);
 		if (isNumber(value)) {
-			await configurationService.updateValue(TerminalSettingId.FontSize, value + 1);
+			const newFontSize = clampTerminalFontSize(value + 1);
+			await configurationService.updateValue(TerminalSettingId.FontSize, newFontSize);
 		}
 	}
 });
@@ -140,7 +147,8 @@ registerTerminalAction({
 		const configurationService = accessor.get(IConfigurationService);
 		const value = configurationService.getValue(TerminalSettingId.FontSize);
 		if (isNumber(value)) {
-			await configurationService.updateValue(TerminalSettingId.FontSize, value - 1);
+			const newFontSize = clampTerminalFontSize(value - 1);
+			await configurationService.updateValue(TerminalSettingId.FontSize, newFontSize);
 		}
 	}
 });
@@ -153,3 +161,7 @@ registerTerminalAction({
 		await configurationService.updateValue(TerminalSettingId.FontSize, defaultTerminalFontSize);
 	}
 });
+
+export function clampTerminalFontSize(fontSize: number): number {
+	return Math.max(6, Math.min(100, fontSize));
+}

src/vs/workbench/contrib/terminalContrib/zoom/test/browser/terminal.zoom.test.ts

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../../base/test/common/utils.js';
+import { clampTerminalFontSize } from '../../browser/terminal.zoom.contribution.js';
+
+suite('Terminal Mouse Wheel Zoom', () => {
+	ensureNoDisposablesAreLeakedInTestSuite();
+
+	test('clamps font size to minimum value when below bounds', () => {
+		const result = clampTerminalFontSize(3 + (-2)); // 3 - 2 = 1, clamped to 6
+		strictEqual(result, 6, 'Font size should be clamped to minimum value of 6');
+	});
+
+	test('clamps font size to maximum value when above bounds', () => {
+		const result = clampTerminalFontSize(99 + 5); // 99 + 5 = 104, clamped to 100
+		strictEqual(result, 100, 'Font size should be clamped to maximum value of 100');
+	});
+
+	test('preserves font size when within bounds', () => {
+		const result = clampTerminalFontSize(12 + 3); // 12 + 3 = 15, within bounds
+		strictEqual(result, 15, 'Font size should remain unchanged when within bounds');
+	});
+
+	test('clamps font size when going below minimum', () => {
+		const result = clampTerminalFontSize(6 + (-1)); // 6 - 1 = 5, clamped to 6
+		strictEqual(result, 6, 'Font size should be clamped when going below minimum');
+	});
+
+	test('clamps font size when going above maximum', () => {
+		const result = clampTerminalFontSize(100 + 1); // 100 + 1 = 101, clamped to 100
+		strictEqual(result, 100, 'Font size should be clamped when going above maximum');
+	});
+});