@codingame/monaco-vscode-api 26.2.1 → 27.0.0

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js

@@ -25,7 +25,7 @@ import { PostEditWidgetManager } from './postEditWidget.js';
 var DropIntoEditorController_1;
 const dropAsPreferenceConfig = "editor.dropIntoEditor.preferences";
 const changeDropTypeCommandId = "editor.changeDropType";
-const dropWidgetVisibleCtx = ( new RawContextKey("dropWidgetVisible", false, ( localize(1040, "Whether the drop widget is showing"))));
+const dropWidgetVisibleCtx = ( new RawContextKey("dropWidgetVisible", false, ( localize(1058, "Whether the drop widget is showing"))));
 let DropIntoEditorController = class DropIntoEditorController extends Disposable {
     static {
         DropIntoEditorController_1 = this;
@@ -57,7 +57,7 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
         this._postDropWidgetManager = this._register(
             instantiationService.createInstance(PostEditWidgetManager, "dropIntoEditor", editor, dropWidgetVisibleCtx, {
                 id: changeDropTypeCommandId,
-                label: ( localize(1041, "Show drop options..."))
+                label: ( localize(1059, "Show drop options..."))
             }, () => DropIntoEditorController_1._configureDefaultAction ? [DropIntoEditorController_1._configureDefaultAction] : [])
         );
         this._register(
@@ -116,7 +116,7 @@ let DropIntoEditorController = class DropIntoEditorController extends Disposable
                 }
             }
         });
-        this._dropProgressManager.showWhile(position, ( localize(1042, "Running drop handlers. Click to cancel")), p, {
+        this._dropProgressManager.showWhile(position, ( localize(1060, "Running drop handlers. Click to cancel")), p, {
             cancel: () => p.cancel()
         });
         DropIntoEditorController_1._currentDropOperation = p;

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js

@@ -194,7 +194,7 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
         try {
             resolvedEdit = await raceCancellationError(resolve(edit, editorStateCts.token), editorStateCts.token);
         } catch (e) {
-            return handleError(e, ( localize(1043, "Error resolving edit '{0}':\n{1}", edit.title, toErrorMessage(e))));
+            return handleError(e, ( localize(1061, "Error resolving edit '{0}':\n{1}", edit.title, toErrorMessage(e))));
         } finally {
             editorStateCts.dispose();
         }
@@ -220,7 +220,7 @@ let PostEditWidgetManager = class PostEditWidgetManager extends Disposable {
             });
             editRange = model.getDecorationRange(editTrackingDecoration[0]);
         } catch (e) {
-            return handleError(e, ( localize(1044, "Error applying edit '{0}':\n{1}", edit.title, toErrorMessage(e))));
+            return handleError(e, ( localize(1062, "Error applying edit '{0}':\n{1}", edit.title, toErrorMessage(e))));
         } finally {
             model.deltaDecorations(editTrackingDecoration, []);
         }

package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js

@@ -11,7 +11,7 @@ import { localize } from '../../../../nls.js';
 import { IEditorCancellationTokens } from './keybindingCancellation.service.js';
 
 const ctxCancellableOperation = ( new RawContextKey("cancellableOperation", false, ( localize(
-    1045,
+    1063,
     "Whether the editor runs a cancellable operation, e.g. like 'Peek References'"
 ))));
 class EditorCancellationTokens {

package/vscode/src/vs/editor/contrib/find/browser/findController.d.ts

@@ -12,6 +12,8 @@ import { IKeybindingService } from "../../../../platform/keybinding/common/keybi
 import { INotificationService } from "../../../../platform/notification/common/notification.service.js";
 import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
 import { IHoverService } from "../../../../platform/hover/browser/hover.service.js";
+import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
+import { IAccessibilityService } from "../../../../platform/accessibility/common/accessibility.service.js";
 export declare function getSelectionSearchString(editor: ICodeEditor, seedSearchStringFromSelection?: "single" | "multiple", seedSearchStringFromNonEmptySelection?: boolean): string | null;
 export declare enum FindStartFocusAction {
     NoFocusChange = 0,
@@ -58,6 +60,16 @@ export declare class CommonFindController extends Disposable implements IEditorC
     private saveQueryState;
     private loadQueryState;
     isFindInputFocused(): boolean;
+    /**
+     * Returns whether the Replace input was the last focused input in the find widget.
+     * Returns false by default; overridden in FindController.
+     */
+    wasReplaceInputLastFocused(): boolean;
+    /**
+     * Focuses the last focused element in the find widget.
+     * Implemented by FindController; base implementation does nothing.
+     */
+    focusLastElement(): void;
     getState(): FindReplaceState;
     closeFindWidget(): void;
     toggleCaseSensitive(): void;
@@ -81,14 +93,26 @@ export declare class CommonFindController extends Disposable implements IEditorC
 export declare class FindController extends CommonFindController implements IFindController {
     private readonly _contextViewService;
     private readonly _keybindingService;
+    private readonly _configurationService;
+    private readonly _accessibilityService;
     private _widget;
     private _findOptionsWidget;
     private _findWidgetSearchHistory;
     private _replaceWidgetHistory;
-    constructor(editor: ICodeEditor, _contextViewService: IContextViewService, _contextKeyService: IContextKeyService, _keybindingService: IKeybindingService, notificationService: INotificationService, _storageService: IStorageService, clipboardService: IClipboardService, hoverService: IHoverService);
+    constructor(editor: ICodeEditor, _contextViewService: IContextViewService, _contextKeyService: IContextKeyService, _keybindingService: IKeybindingService, notificationService: INotificationService, _storageService: IStorageService, clipboardService: IClipboardService, hoverService: IHoverService, _configurationService: IConfigurationService, _accessibilityService: IAccessibilityService);
     protected _start(opts: IFindStartOptions, newState?: INewFindReplaceState): Promise<void>;
     highlightFindOptions(ignoreWhenVisible?: boolean): void;
     private _createFindWidget;
+    /**
+     * Returns whether the Replace input was the last focused input in the find widget.
+     */
+    wasReplaceInputLastFocused(): boolean;
+    /**
+     * Focuses the last focused element in the find widget.
+     * This is more precise than just focusing the Find or Replace input,
+     * as it can restore focus to checkboxes, buttons, etc.
+     */
+    focusLastElement(): void;
     saveViewState(): any;
     restoreViewState(state: any): void;
 }

package/vscode/src/vs/editor/contrib/find/browser/findController.js

@@ -30,6 +30,8 @@ import { themeColorFromId } from '../../../../platform/theme/common/themeService
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { FindWidgetSearchHistory } from './findWidgetSearchHistory.js';
 import { ReplaceWidgetHistory } from './replaceWidgetHistory.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 
 var CommonFindController_1;
@@ -92,7 +94,7 @@ let CommonFindController = class CommonFindController extends Disposable {
         this._clipboardService = clipboardService;
         this._notificationService = notificationService;
         this._hoverService = hoverService;
-        this._updateHistoryDelayer = ( new Delayer(500));
+        this._updateHistoryDelayer = this._register(( new Delayer(500)));
         this._state = this._register(( new FindReplaceState()));
         this.loadQueryState();
         this._register(this._state.onFindReplaceStateChange(e => this._onStateChanged(e)));
@@ -190,6 +192,10 @@ let CommonFindController = class CommonFindController extends Disposable {
     isFindInputFocused() {
         return !!CONTEXT_FIND_INPUT_FOCUSED.getValue(this._contextKeyService);
     }
+    wasReplaceInputLastFocused() {
+        return false;
+    }
+    focusLastElement() {}
     getState() {
         return this._state;
     }
@@ -357,7 +363,7 @@ let CommonFindController = class CommonFindController extends Disposable {
     replaceAll() {
         if (this._model) {
             if (this._editor.getModel()?.isTooLargeForHeapOperation()) {
-                this._notificationService.warn(( localize(1046, "The file is too large to perform a replace all operation.")));
+                this._notificationService.warn(( localize(1064, "The file is too large to perform a replace all operation.")));
                 return false;
             }
             this._model.replaceAll();
@@ -395,7 +401,9 @@ let FindController = class FindController extends CommonFindController {
         notificationService,
         _storageService,
         clipboardService,
-        hoverService
+        hoverService,
+        _configurationService,
+        _accessibilityService
     ) {
         super(
             editor,
@@ -407,6 +415,8 @@ let FindController = class FindController extends CommonFindController {
         );
         this._contextViewService = _contextViewService;
         this._keybindingService = _keybindingService;
+        this._configurationService = _configurationService;
+        this._accessibilityService = _accessibilityService;
         this._widget = null;
         this._findOptionsWidget = null;
         this._findWidgetSearchHistory = FindWidgetSearchHistory.getOrCreate(_storageService);
@@ -462,10 +472,18 @@ let FindController = class FindController extends CommonFindController {
             this._contextKeyService,
             this._hoverService,
             this._findWidgetSearchHistory,
-            this._replaceWidgetHistory
+            this._replaceWidgetHistory,
+            this._configurationService,
+            this._accessibilityService
         )));
         this._findOptionsWidget = this._register(( new FindOptionsWidget(this._editor, this._state, this._keybindingService)));
     }
+    wasReplaceInputLastFocused() {
+        return this._widget?.lastFocusedInputWasReplace ?? false;
+    }
+    focusLastElement() {
+        this._widget?.focusLastElement();
+    }
     saveViewState() {
         return this._widget?.getViewState();
     }
@@ -473,10 +491,10 @@ let FindController = class FindController extends CommonFindController {
         this._widget?.setViewState(state);
     }
 };
-FindController = ( __decorate([( __param(1, IContextViewService)), ( __param(2, IContextKeyService)), ( __param(3, IKeybindingService)), ( __param(4, INotificationService)), ( __param(5, IStorageService)), ( __param(6, IClipboardService)), ( __param(7, IHoverService))], FindController));
+FindController = ( __decorate([( __param(1, IContextViewService)), ( __param(2, IContextKeyService)), ( __param(3, IKeybindingService)), ( __param(4, INotificationService)), ( __param(5, IStorageService)), ( __param(6, IClipboardService)), ( __param(7, IHoverService)), ( __param(8, IConfigurationService)), ( __param(9, IAccessibilityService))], FindController));
 const StartFindAction = registerMultiEditorAction(( new MultiEditorAction({
     id: FIND_IDS.StartFindAction,
-    label: ( localize2(1047, "Find")),
+    label: ( localize2(1065, "Find")),
     precondition: ( ContextKeyExpr.or(EditorContextKeys.focus, ( ContextKeyExpr.has("editorIsOpen")))),
     kbOpts: {
         kbExpr: null,
@@ -486,7 +504,7 @@ const StartFindAction = registerMultiEditorAction(( new MultiEditorAction({
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
         group: "3_find",
-        title: ( localize(1048, "&&Find")),
+        title: ( localize(1066, "&&Find")),
         order: 1
     }
 })));
@@ -541,7 +559,7 @@ class StartFindWithArgsAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.StartFindWithArgs,
-            label: ( localize2(1049, "Find with Arguments")),
+            label: ( localize2(1067, "Find with Arguments")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: null,
@@ -581,7 +599,7 @@ class StartFindWithSelectionAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.StartFindWithSelection,
-            label: ( localize2(1050, "Find with Selection")),
+            label: ( localize2(1068, "Find with Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: null,
@@ -639,7 +657,7 @@ async function matchFindAction(editor, next) {
 }
 const NextMatchFindAction = registerMultiEditorAction(( new MultiEditorAction({
     id: FIND_IDS.NextMatchFindAction,
-    label: ( localize2(1051, "Find Next")),
+    label: ( localize2(1069, "Find Next")),
     precondition: undefined,
     kbOpts: [{
         kbExpr: EditorContextKeys.focus,
@@ -660,7 +678,7 @@ NextMatchFindAction.addImplementation(0, async (accessor, editor, args) => {
 });
 const PreviousMatchFindAction = registerMultiEditorAction(( new MultiEditorAction({
     id: FIND_IDS.PreviousMatchFindAction,
-    label: ( localize2(1052, "Find Previous")),
+    label: ( localize2(1070, "Find Previous")),
     precondition: undefined,
     kbOpts: [{
         kbExpr: EditorContextKeys.focus,
@@ -683,7 +701,7 @@ class MoveToMatchFindAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.GoToMatchFindAction,
-            label: ( localize2(1053, "Go to Match...")),
+            label: ( localize2(1071, "Go to Match...")),
             precondition: CONTEXT_FIND_WIDGET_VISIBLE
         });
         this._highlightDecorations = [];
@@ -698,7 +716,7 @@ class MoveToMatchFindAction extends EditorAction {
             const notificationService = accessor.get(INotificationService);
             notificationService.notify({
                 severity: Severity$1.Warning,
-                message: ( localize(1054, "No matches. Try searching for something else."))
+                message: ( localize(1072, "No matches. Try searching for something else."))
             });
             return;
         }
@@ -706,7 +724,7 @@ class MoveToMatchFindAction extends EditorAction {
         const disposables = ( new DisposableStore());
         const inputBox = disposables.add(quickInputService.createInputBox());
         inputBox.placeholder = ( localize(
-            1055,
+            1073,
             "Type a number to go to a specific match (between 1 and {0})",
             matchesCount
         ));
@@ -734,7 +752,7 @@ class MoveToMatchFindAction extends EditorAction {
                 }
             } else {
                 inputBox.validationMessage = ( localize(
-                    1056,
+                    1074,
                     "Please type a number between 1 and {0}",
                     controller.getState().matchesCount
                 ));
@@ -751,7 +769,7 @@ class MoveToMatchFindAction extends EditorAction {
                 inputBox.hide();
             } else {
                 inputBox.validationMessage = ( localize(
-                    1056,
+                    1074,
                     "Please type a number between 1 and {0}",
                     controller.getState().matchesCount
                 ));
@@ -819,7 +837,7 @@ class NextSelectionMatchFindAction extends SelectionMatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.NextSelectionMatchFindAction,
-            label: ( localize2(1057, "Find Next Selection")),
+            label: ( localize2(1075, "Find Next Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
@@ -836,7 +854,7 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.PreviousSelectionMatchFindAction,
-            label: ( localize2(1058, "Find Previous Selection")),
+            label: ( localize2(1076, "Find Previous Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.focus,
@@ -851,7 +869,7 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
 }
 const StartFindReplaceAction = registerMultiEditorAction(( new MultiEditorAction({
     id: FIND_IDS.StartFindReplaceAction,
-    label: ( localize2(1059, "Replace")),
+    label: ( localize2(1077, "Replace")),
     precondition: ( ContextKeyExpr.or(EditorContextKeys.focus, ( ContextKeyExpr.has("editorIsOpen")))),
     kbOpts: {
         kbExpr: null,
@@ -864,7 +882,7 @@ const StartFindReplaceAction = registerMultiEditorAction(( new MultiEditorAction
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
         group: "3_find",
-        title: ( localize(1060, "&&Replace")),
+        title: ( localize(1078, "&&Replace")),
         order: 2
     }
 })));

package/vscode/src/vs/editor/contrib/find/browser/findModel.d.ts

@@ -6,6 +6,11 @@ export declare const CONTEXT_FIND_WIDGET_VISIBLE: RawContextKey<boolean>;
 export declare const CONTEXT_FIND_WIDGET_NOT_VISIBLE: import("../../../../platform/contextkey/common/contextkey.js").ContextKeyExpression;
 export declare const CONTEXT_FIND_INPUT_FOCUSED: RawContextKey<boolean>;
 export declare const CONTEXT_REPLACE_INPUT_FOCUSED: RawContextKey<boolean>;
+/**
+ * Context key that is true when any element within the Find widget has focus.
+ * This includes the Find input, Replace input, checkboxes, buttons, etc.
+ */
+export declare const CONTEXT_FIND_WIDGET_FOCUSED: RawContextKey<boolean>;
 export declare const ToggleCaseSensitiveKeybinding: IKeybindings;
 export declare const ToggleWholeWordKeybinding: IKeybindings;
 export declare const ToggleRegexKeybinding: IKeybindings;

package/vscode/src/vs/editor/contrib/find/browser/findModel.js

@@ -22,6 +22,7 @@ const CONTEXT_FIND_WIDGET_VISIBLE = ( new RawContextKey("findWidgetVisible", fal
 const CONTEXT_FIND_WIDGET_NOT_VISIBLE = ( CONTEXT_FIND_WIDGET_VISIBLE.toNegated());
 const CONTEXT_FIND_INPUT_FOCUSED = ( new RawContextKey("findInputFocussed", false));
 const CONTEXT_REPLACE_INPUT_FOCUSED = ( new RawContextKey("replaceInputFocussed", false));
+const CONTEXT_FIND_WIDGET_FOCUSED = ( new RawContextKey("findWidgetFocused", false));
 const ToggleCaseSensitiveKeybinding = {
     primary: KeyMod$1.Alt | KeyCode.KeyC,
     mac: {
@@ -532,4 +533,4 @@ class FindModelBoundToEditorModel {
     }
 }
 
-export { CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_FIND_WIDGET_NOT_VISIBLE, CONTEXT_FIND_WIDGET_VISIBLE, CONTEXT_REPLACE_INPUT_FOCUSED, FIND_IDS, FindModelBoundToEditorModel, MATCHES_LIMIT, ToggleCaseSensitiveKeybinding, TogglePreserveCaseKeybinding, ToggleRegexKeybinding, ToggleSearchScopeKeybinding, ToggleWholeWordKeybinding };
+export { CONTEXT_FIND_INPUT_FOCUSED, CONTEXT_FIND_WIDGET_FOCUSED, CONTEXT_FIND_WIDGET_NOT_VISIBLE, CONTEXT_FIND_WIDGET_VISIBLE, CONTEXT_REPLACE_INPUT_FOCUSED, FIND_IDS, FindModelBoundToEditorModel, MATCHES_LIMIT, ToggleCaseSensitiveKeybinding, TogglePreserveCaseKeybinding, ToggleRegexKeybinding, ToggleSearchScopeKeybinding, ToggleWholeWordKeybinding };

package/vscode/src/vs/editor/contrib/find/browser/findWidget.d.ts

@@ -4,12 +4,14 @@ import { IVerticalSashLayoutProvider, Sash } from "../../../../base/browser/ui/s
 import { Widget } from "../../../../base/browser/ui/widget.js";
 import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition, IViewZone } from "../../../browser/editorBrowser.js";
 import { FindReplaceState } from "./findState.js";
+import { IAccessibilityService } from "../../../../platform/accessibility/common/accessibility.service.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { IKeybindingService } from "../../../../platform/keybinding/common/keybinding.service.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
 import { IHoverService } from "../../../../platform/hover/browser/hover.service.js";
 import { IHistory } from "../../../../base/common/history.js";
 import { type IHoverLifecycleOptions } from "../../../../base/browser/ui/hover/hover.js";
+import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 export declare const findSelectionIcon: ThemeIcon;
 export declare const findReplaceIcon: ThemeIcon;
 export declare const findReplaceAllIcon: ThemeIcon;
@@ -33,6 +35,8 @@ export declare class FindWidget extends Widget implements IOverlayWidget, IVerti
     private readonly _hoverService;
     private readonly _findWidgetSearchHistory;
     private readonly _replaceWidgetHistory;
+    private readonly _configurationService;
+    private readonly _accessibilityService;
     private static readonly ID;
     private readonly _codeEditor;
     private readonly _state;
@@ -55,18 +59,41 @@ export declare class FindWidget extends Widget implements IOverlayWidget, IVerti
     private _isVisible;
     private _isReplaceVisible;
     private _ignoreChangeEvent;
+    private _accessibilityHelpHintAnnounced;
+    private _labelResetTimeout;
+    private _lastFocusedInputWasReplace;
     private readonly _findFocusTracker;
     private readonly _findInputFocused;
     private readonly _replaceFocusTracker;
     private readonly _replaceInputFocused;
+    private _widgetFocusTracker;
+    private readonly _findWidgetFocused;
+    private _lastFocusedElement;
     private _viewZone?;
     private _viewZoneId?;
     private _resizeSash;
     private _resized;
     private readonly _updateHistoryDelayer;
-    constructor(codeEditor: ICodeEditor, controller: IFindController, state: FindReplaceState, contextViewProvider: IContextViewProvider, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, _hoverService: IHoverService, _findWidgetSearchHistory: IHistory<string> | undefined, _replaceWidgetHistory: IHistory<string> | undefined);
+    constructor(codeEditor: ICodeEditor, controller: IFindController, state: FindReplaceState, contextViewProvider: IContextViewProvider, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, _hoverService: IHoverService, _findWidgetSearchHistory: IHistory<string> | undefined, _replaceWidgetHistory: IHistory<string> | undefined, _configurationService: IConfigurationService, _accessibilityService: IAccessibilityService);
     getId(): string;
     getDomNode(): HTMLElement;
+    /**
+     * Returns whether the Replace input was the last focused input in the find widget.
+     * This persists even after focus leaves the widget, allowing external code to know
+     * which input to restore focus to.
+     */
+    get lastFocusedInputWasReplace(): boolean;
+    /**
+     * Returns the last focused element within the Find widget.
+     * This is useful for restoring focus to the exact element after
+     * accessibility help or other overlays are dismissed.
+     */
+    get lastFocusedElement(): HTMLElement | null;
+    /**
+     * Focuses the last focused element in the Find widget.
+     * Falls back to the Find or Replace input based on lastFocusedInputWasReplace.
+     */
+    focusLastElement(): void;
     getPosition(): IOverlayWidgetPosition | null;
     private _onStateChanged;
     private _delayedUpdateHistory;
@@ -99,6 +126,7 @@ export declare class FindWidget extends Widget implements IOverlayWidget, IVerti
     private _keybindingLabelFor;
     private _buildDomNode;
     private updateAccessibilitySupport;
+    private _updateFindInputAriaLabel;
     getViewState(): {
         widgetViewZoneVisible: boolean;
         scrollTop: number;