@codingame/monaco-vscode-api 8.0.4 → 9.0.0

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Delayer } from '../../../../base/common/async.js';
 import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
 import { registerMultiEditorAction, registerEditorContribution, registerEditorAction, registerEditorCommand, MultiEditorAction, EditorContributionInstantiation, EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
@@ -306,7 +306,7 @@ let CommonFindController = class CommonFindController extends Disposable {
     replaceAll() {
         if (this._model) {
             if (this._editor.getModel()?.isTooLargeForHeapOperation()) {
-                this._notificationService.warn(( localize(1392, "The file is too large to perform a replace all operation.")));
+                this._notificationService.warn(( localize(1398, "The file is too large to perform a replace all operation.")));
                 return false;
             }
             this._model.replaceAll();
@@ -429,7 +429,7 @@ FindController = ( (__decorate([
 ], FindController)));
 const StartFindAction = registerMultiEditorAction(( (new MultiEditorAction({
     id: FIND_IDS.StartFindAction,
-    label: ( localize(1393, "Find")),
+    label: ( localize(1399, "Find")),
     alias: 'Find',
     precondition: ( (ContextKeyExpr.or(
         EditorContextKeys.focus,
@@ -443,7 +443,7 @@ const StartFindAction = registerMultiEditorAction(( (new MultiEditorAction({
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
         group: '3_find',
-        title: ( localize(1394, "&&Find")),
+        title: ( localize(1400, "&&Find")),
         order: 1
     }
 }))));
@@ -484,7 +484,7 @@ class StartFindWithArgsAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.StartFindWithArgs,
-            label: ( localize(1395, "Find With Arguments")),
+            label: ( localize(1401, "Find With Arguments")),
             alias: 'Find With Arguments',
             precondition: undefined,
             kbOpts: {
@@ -525,7 +525,7 @@ class StartFindWithSelectionAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.StartFindWithSelection,
-            label: ( localize(1396, "Find With Selection")),
+            label: ( localize(1402, "Find With Selection")),
             alias: 'Find With Selection',
             precondition: undefined,
             kbOpts: {
@@ -577,7 +577,7 @@ class NextMatchFindAction extends MatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.NextMatchFindAction,
-            label: ( localize(1397, "Find Next")),
+            label: ( localize(1403, "Find Next")),
             alias: 'Find Next',
             precondition: undefined,
             kbOpts: [{
@@ -605,7 +605,7 @@ class PreviousMatchFindAction extends MatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.PreviousMatchFindAction,
-            label: ( localize(1398, "Find Previous")),
+            label: ( localize(1404, "Find Previous")),
             alias: 'Find Previous',
             precondition: undefined,
             kbOpts: [{
@@ -629,7 +629,7 @@ class MoveToMatchFindAction extends EditorAction {
     constructor() {
         super({
             id: FIND_IDS.GoToMatchFindAction,
-            label: ( localize(1399, "Go to Match...")),
+            label: ( localize(1405, "Go to Match...")),
             alias: 'Go to Match...',
             precondition: CONTEXT_FIND_WIDGET_VISIBLE
         });
@@ -645,14 +645,15 @@ class MoveToMatchFindAction extends EditorAction {
             const notificationService = accessor.get(INotificationService);
             notificationService.notify({
                 severity: Severity$1.Warning,
-                message: ( localize(1400, "No matches. Try searching for something else."))
+                message: ( localize(1406, "No matches. Try searching for something else."))
             });
             return;
         }
         const quickInputService = accessor.get(IQuickInputService);
-        const inputBox = quickInputService.createInputBox();
+        const disposables = ( (new DisposableStore()));
+        const inputBox = disposables.add(quickInputService.createInputBox());
         inputBox.placeholder = ( localize(
-            1401,
+            1407,
             "Type a number to go to a specific match (between 1 and {0})",
             matchesCount
         ));
@@ -682,17 +683,17 @@ class MoveToMatchFindAction extends EditorAction {
             }
             else {
                 inputBox.validationMessage = ( localize(
-                    1402,
+                    1408,
                     "Please type a number between 1 and {0}",
                     controller.getState().matchesCount
                 ));
                 this.clearDecorations(editor);
             }
         };
-        inputBox.onDidChangeValue(value => {
+        disposables.add(inputBox.onDidChangeValue(value => {
             updatePickerAndEditor(value);
-        });
-        inputBox.onDidAccept(() => {
+        }));
+        disposables.add(inputBox.onDidAccept(() => {
             const index = toFindMatchIndex(inputBox.value);
             if (typeof index === 'number') {
                 controller.goToMatch(index);
@@ -700,16 +701,16 @@ class MoveToMatchFindAction extends EditorAction {
             }
             else {
                 inputBox.validationMessage = ( localize(
-                    1402,
+                    1408,
                     "Please type a number between 1 and {0}",
                     controller.getState().matchesCount
                 ));
             }
-        });
-        inputBox.onDidHide(() => {
+        }));
+        disposables.add(inputBox.onDidHide(() => {
             this.clearDecorations(editor);
-            inputBox.dispose();
-        });
+            disposables.dispose();
+        }));
         inputBox.show();
     }
     clearDecorations(editor) {
@@ -771,7 +772,7 @@ class NextSelectionMatchFindAction extends SelectionMatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.NextSelectionMatchFindAction,
-            label: ( localize(1403, "Find Next Selection")),
+            label: ( localize(1409, "Find Next Selection")),
             alias: 'Find Next Selection',
             precondition: undefined,
             kbOpts: {
@@ -789,7 +790,7 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
     constructor() {
         super({
             id: FIND_IDS.PreviousSelectionMatchFindAction,
-            label: ( localize(1404, "Find Previous Selection")),
+            label: ( localize(1410, "Find Previous Selection")),
             alias: 'Find Previous Selection',
             precondition: undefined,
             kbOpts: {
@@ -805,7 +806,7 @@ class PreviousSelectionMatchFindAction extends SelectionMatchFindAction {
 }
 const StartFindReplaceAction = registerMultiEditorAction(( (new MultiEditorAction({
     id: FIND_IDS.StartFindReplaceAction,
-    label: ( localize(1405, "Replace")),
+    label: ( localize(1411, "Replace")),
     alias: 'Replace',
     precondition: ( (ContextKeyExpr.or(
         EditorContextKeys.focus,
@@ -820,7 +821,7 @@ const StartFindReplaceAction = registerMultiEditorAction(( (new MultiEditorActio
     menuOpts: {
         menuId: MenuId.MenubarEditMenu,
         group: '3_find',
-        title: ( localize(1406, "&&Replace")),
+        title: ( localize(1412, "&&Replace")),
         order: 2
     }
 }))));

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

@@ -38,32 +38,32 @@ import { isHighContrast } from '../../../../platform/theme/common/theme.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, ( localize(5053, 'Icon to indicate that the editor find widget is collapsed.')));
-const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, ( localize(5054, 'Icon to indicate that the editor find widget is expanded.')));
-const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localize(5055, 'Icon for \'Find in Selection\' in the editor find widget.')));
-const findReplaceIcon = registerIcon('find-replace', Codicon.replace, ( localize(5056, 'Icon for \'Replace\' in the editor find widget.')));
-const findReplaceAllIcon = registerIcon('find-replace-all', Codicon.replaceAll, ( localize(5057, 'Icon for \'Replace All\' in the editor find widget.')));
-const findPreviousMatchIcon = registerIcon('find-previous-match', Codicon.arrowUp, ( localize(5058, 'Icon for \'Find Previous\' in the editor find widget.')));
-const findNextMatchIcon = registerIcon('find-next-match', Codicon.arrowDown, ( localize(5059, 'Icon for \'Find Next\' in the editor find widget.')));
-const NLS_FIND_DIALOG_LABEL = ( localize(5060, "Find / Replace"));
-const NLS_FIND_INPUT_LABEL = ( localize(5061, "Find"));
-const NLS_FIND_INPUT_PLACEHOLDER = ( localize(5062, "Find"));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(5063, "Previous Match"));
-const NLS_NEXT_MATCH_BTN_LABEL = ( localize(5064, "Next Match"));
-const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(5065, "Find in Selection"));
-const NLS_CLOSE_BTN_LABEL = ( localize(5066, "Close"));
-const NLS_REPLACE_INPUT_LABEL = ( localize(5067, "Replace"));
-const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(5068, "Replace"));
-const NLS_REPLACE_BTN_LABEL = ( localize(5069, "Replace"));
-const NLS_REPLACE_ALL_BTN_LABEL = ( localize(5070, "Replace All"));
-const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(5071, "Toggle Replace"));
+const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, ( localize(5033, 'Icon to indicate that the editor find widget is collapsed.')));
+const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, ( localize(5034, 'Icon to indicate that the editor find widget is expanded.')));
+const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localize(5035, 'Icon for \'Find in Selection\' in the editor find widget.')));
+const findReplaceIcon = registerIcon('find-replace', Codicon.replace, ( localize(5036, 'Icon for \'Replace\' in the editor find widget.')));
+const findReplaceAllIcon = registerIcon('find-replace-all', Codicon.replaceAll, ( localize(5037, 'Icon for \'Replace All\' in the editor find widget.')));
+const findPreviousMatchIcon = registerIcon('find-previous-match', Codicon.arrowUp, ( localize(5038, 'Icon for \'Find Previous\' in the editor find widget.')));
+const findNextMatchIcon = registerIcon('find-next-match', Codicon.arrowDown, ( localize(5039, 'Icon for \'Find Next\' in the editor find widget.')));
+const NLS_FIND_DIALOG_LABEL = ( localize(5040, "Find / Replace"));
+const NLS_FIND_INPUT_LABEL = ( localize(5041, "Find"));
+const NLS_FIND_INPUT_PLACEHOLDER = ( localize(5042, "Find"));
+const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(5043, "Previous Match"));
+const NLS_NEXT_MATCH_BTN_LABEL = ( localize(5044, "Next Match"));
+const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(5045, "Find in Selection"));
+const NLS_CLOSE_BTN_LABEL = ( localize(5046, "Close"));
+const NLS_REPLACE_INPUT_LABEL = ( localize(5047, "Replace"));
+const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(5048, "Replace"));
+const NLS_REPLACE_BTN_LABEL = ( localize(5049, "Replace"));
+const NLS_REPLACE_ALL_BTN_LABEL = ( localize(5050, "Replace All"));
+const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(5051, "Toggle Replace"));
 const NLS_MATCHES_COUNT_LIMIT_TITLE = ( localize(
-    5072,
+    5052,
     "Only the first {0} results are highlighted, but all find operations work on the entire text.",
     MATCHES_LIMIT
 ));
-const NLS_MATCHES_LOCATION = ( localize(5073, "{0} of {1}"));
-const NLS_NO_RESULTS = ( localize(5074, "No results"));
+const NLS_MATCHES_LOCATION = ( localize(5053, "{0} of {1}"));
+const NLS_NO_RESULTS = ( localize(5054, "No results"));
 const FIND_WIDGET_INITIAL_WIDTH = 419;
 const PART_WIDTH = 275;
 const FIND_INPUT_AREA_WIDTH = PART_WIDTH - 54;
@@ -335,12 +335,12 @@ class FindWidget extends Widget {
     _getAriaLabel(label, currentMatch, searchString) {
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( localize(5075, "{0} found", label))
-                : ( localize(5076, "{0} found for '{1}'", label, searchString));
+                ? ( localize(5055, "{0} found", label))
+                : ( localize(5056, "{0} found for '{1}'", label, searchString));
         }
         if (currentMatch) {
             const ariaLabel = ( localize(
-                5077,
+                5057,
                 "{0} found for '{1}', at {2}",
                 label,
                 searchString,
@@ -353,7 +353,7 @@ class FindWidget extends Widget {
             }
             return ariaLabel;
         }
-        return ( localize(5078, "{0} found for '{1}'", label, searchString));
+        return ( localize(5058, "{0} found for '{1}'", label, searchString));
     }
     _updateToggleSelectionFindButton() {
         const selection = this._codeEditor.getSelection();
@@ -686,7 +686,7 @@ class FindWidget extends Widget {
             else {
                 if (isWindows && isNative && !this._ctrlEnterReplaceAllWarningPrompted) {
                     this._notificationService.info(( localize(
-                        5079,
+                        5059,
                         'Ctrl+Enter now inserts line break instead of replacing all. You can modify the keybinding for editor.action.replaceAll to override this behavior.'
                     )));
                     this._ctrlEnterReplaceAllWarningPrompted = true;

package/vscode/src/vs/editor/contrib/folding/browser/folding.d.ts

@@ -87,5 +87,8 @@ declare class RangesLimitReporter implements FoldingLimitReporter {
     get limited(): number | false;
     update(computed: number, limited: number | false): void;
 }
+interface SelectedLines {
+    startsInside(startLine: number, endLine: number): boolean;
+}
 
-export { FoldingController, type FoldingLimitReporter, type FoldingRangeProviderSelector, RangesLimitReporter };
+export { FoldingController, type FoldingLimitReporter, type FoldingRangeProviderSelector, RangesLimitReporter, type SelectedLines };

package/vscode/src/vs/editor/contrib/folding/browser/folding.js

@@ -238,8 +238,7 @@ let FoldingController = class FoldingController extends Disposable {
                             }
                         }
                         const selections = this.editor.getSelections();
-                        const selectionLineNumbers = selections ? ( (selections.map(s => s.startLineNumber))) : [];
-                        foldingModel.update(foldingRanges, selectionLineNumbers);
+                        foldingModel.update(foldingRanges, toSelectedLines(selections));
                         scrollState?.restore(this.editor);
                         const newValue = this.updateDebounceInfo.update(foldingModel.textModel, sw.elapsed());
                         if (this.updateScheduler) {
@@ -468,6 +467,24 @@ class FoldingAction extends EditorAction {
     run(_accessor, _editor) {
     }
 }
+function toSelectedLines(selections) {
+    if (!selections || selections.length === 0) {
+        return {
+            startsInside: () => false
+        };
+    }
+    return {
+        startsInside(startLine, endLine) {
+            for (const s of selections) {
+                const line = s.startLineNumber;
+                if (line >= startLine && line <= endLine) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    };
+}
 function foldingArgumentsConstraint(args) {
     if (!isUndefined(args)) {
         if (!isObject(args)) {
@@ -1104,4 +1121,4 @@ CommandsRegistry.registerCommand('_executeFoldingRangeProvider', async function
         rangeProvider.dispose();
     }
 });
-export { FoldingController, RangesLimitReporter };
+export { FoldingController, RangesLimitReporter, toSelectedLines };

package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js

@@ -17,21 +17,21 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 const foldBackground = registerColor('editor.foldBackground', { light: ( (transparent(editorSelectionBackground, 0.3))), dark: ( (transparent(editorSelectionBackground, 0.3))), hcDark: null, hcLight: null }, ( localize(
-    1685,
+    3344,
     "Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations."
 )), true);
 registerColor('editor.foldPlaceholderForeground', { light: '#808080', dark: '#808080', hcDark: null, hcLight: null }, ( localize(
-    1686,
+    3345,
     "Color of the collapsed text after the first line of a folded range."
 )));
-registerColor('editorGutter.foldingControlForeground', iconForeground, ( localize(1687, 'Color of the folding control in the editor gutter.')));
-const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, ( localize(1688, 'Icon for expanded ranges in the editor glyph margin.')));
-const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, ( localize(1689, 'Icon for collapsed ranges in the editor glyph margin.')));
-const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, ( localize(1690, 'Icon for manually collapsed ranges in the editor glyph margin.')));
-const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, ( localize(1691, 'Icon for manually expanded ranges in the editor glyph margin.')));
+registerColor('editorGutter.foldingControlForeground', iconForeground, ( localize(3346, 'Color of the folding control in the editor gutter.')));
+const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, ( localize(3347, 'Icon for expanded ranges in the editor glyph margin.')));
+const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, ( localize(3348, 'Icon for collapsed ranges in the editor glyph margin.')));
+const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, ( localize(3349, 'Icon for manually collapsed ranges in the editor glyph margin.')));
+const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, ( localize(3350, 'Icon for manually expanded ranges in the editor glyph margin.')));
 const foldedBackgroundMinimap = { color: themeColorFromId(foldBackground), position: MinimapPosition.Inline };
-const collapsed = ( localize(1692, "Click to expand the range."));
-const expanded = ( localize(1693, "Click to collapse the range."));
+const collapsed = ( localize(3351, "Click to expand the range."));
+const expanded = ( localize(3352, "Click to collapse the range."));
 class FoldingDecorationProvider {
     static { this.COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
         description: 'folding-collapsed-visual-decoration',

package/vscode/src/vs/editor/contrib/folding/browser/foldingModel.d.ts

@@ -1,6 +1,7 @@
 import { Event } from '../../../../base/common/event.js';
 import { ITextModel, IModelDecorationOptions, IModelDecorationsChangeAccessor } from '../../../common/model.js';
 import { FoldingRegions, FoldingRegion, ILineRange, FoldSource } from './foldingRanges.js';
+import { SelectedLines } from './folding.js';
 
 interface IDecorationProvider {
     getDecorationOption(isCollapsed: boolean, isHidden: boolean, isManual: boolean): IModelDecorationOptions;
@@ -30,7 +31,7 @@ declare class FoldingModel {
     constructor(textModel: ITextModel, decorationProvider: IDecorationProvider);
     toggleCollapseState(toggledRegions: FoldingRegion[]): void;
     removeManualRanges(ranges: ILineRange[]): void;
-    update(newRegions: FoldingRegions, blockedLineNumers?: number[]): void;
+    update(newRegions: FoldingRegions, selection?: SelectedLines): void;
     updatePost(newRegions: FoldingRegions): void;
     private _currentFoldedOrManualRanges;
     /**

package/vscode/src/vs/editor/contrib/folding/browser/foldingModel.js

@@ -70,9 +70,9 @@ class FoldingModel {
         }
         this.updatePost(FoldingRegions.fromFoldRanges(newFoldingRanges));
     }
-    update(newRegions, blockedLineNumers = []) {
-        const foldedOrManualRanges = this._currentFoldedOrManualRanges(blockedLineNumers);
-        const newRanges = FoldingRegions.sanitizeAndMerge(newRegions, foldedOrManualRanges, this._textModel.getLineCount());
+    update(newRegions, selection) {
+        const foldedOrManualRanges = this._currentFoldedOrManualRanges(selection);
+        const newRanges = FoldingRegions.sanitizeAndMerge(newRegions, foldedOrManualRanges, this._textModel.getLineCount(), selection);
         this.updatePost(FoldingRegions.fromFoldRanges(newRanges));
     }
     updatePost(newRegions) {
@@ -98,15 +98,7 @@ class FoldingModel {
         this._regions = newRegions;
         this._updateEventEmitter.fire({ model: this });
     }
-    _currentFoldedOrManualRanges(blockedLineNumers = []) {
-        const isBlocked = (startLineNumber, endLineNumber) => {
-            for (const blockedLineNumber of blockedLineNumers) {
-                if (startLineNumber < blockedLineNumber && blockedLineNumber <= endLineNumber) {
-                    return true;
-                }
-            }
-            return false;
-        };
+    _currentFoldedOrManualRanges(selection) {
         const foldedRanges = [];
         for (let i = 0, limit = this._regions.length; i < limit; i++) {
             let isCollapsed = this.regions.isCollapsed(i);
@@ -115,7 +107,7 @@ class FoldingModel {
                 const foldRange = this._regions.toFoldRange(i);
                 const decRange = this._textModel.getDecorationRange(this._editorDecorationIds[i]);
                 if (decRange) {
-                    if (isCollapsed && isBlocked(decRange.startLineNumber, decRange.endLineNumber)) {
+                    if (isCollapsed && selection?.startsInside(decRange.startLineNumber + 1, decRange.endLineNumber)) {
                         isCollapsed = false;
                     }
                     foldedRanges.push({

package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.d.ts

@@ -1,3 +1,5 @@
+import { SelectedLines } from './folding.js';
+
 interface ILineRange {
     startLineNumber: number;
     endLineNumber: number;
@@ -59,7 +61,7 @@ declare class FoldingRegions {
      * 		it is out of sequence or has the same start line as a preceding entry,
      * 		it overlaps a preceding entry and is not fully contained by that entry.
      */
-    static sanitizeAndMerge(rangesA: FoldingRegions | FoldRange[], rangesB: FoldingRegions | FoldRange[], maxLineNumber: number | undefined): FoldRange[];
+    static sanitizeAndMerge(rangesA: FoldingRegions | FoldRange[], rangesB: FoldingRegions | FoldRange[], maxLineNumber: number | undefined, selection?: SelectedLines): FoldRange[];
 }
 declare class FoldingRegion {
     private readonly ranges;

package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.js

@@ -229,7 +229,7 @@ class FoldingRegions {
         }
         return regions;
     }
-    static sanitizeAndMerge(rangesA, rangesB, maxLineNumber) {
+    static sanitizeAndMerge(rangesA, rangesB, maxLineNumber, selection) {
         maxLineNumber = maxLineNumber ?? Number.MAX_VALUE;
         const getIndexedFunction = (r, limit) => {
             return Array.isArray(r)
@@ -255,7 +255,7 @@ class FoldingRegions {
                     }
                     else {
                         useRange = nextA;
-                        useRange.isCollapsed = nextB.isCollapsed && nextA.endLineNumber === nextB.endLineNumber;
+                        useRange.isCollapsed = nextB.isCollapsed && (nextA.endLineNumber === nextB.endLineNumber || !selection?.startsInside(nextA.startLineNumber + 1, nextA.endLineNumber + 1));
                         useRange.source = FoldSource.provider;
                     }
                     nextA = getA(++indexA);

package/vscode/src/vs/editor/contrib/fontZoom/browser/fontZoom.js

@@ -5,7 +5,7 @@ class EditorFontZoomIn extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomIn',
-            label: ( localize(1389, "Increase Editor Font Size")),
+            label: ( localize(1413, "Increase Editor Font Size")),
             alias: 'Increase Editor Font Size',
             precondition: undefined
         });
@@ -18,7 +18,7 @@ class EditorFontZoomOut extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomOut',
-            label: ( localize(1390, "Decrease Editor Font Size")),
+            label: ( localize(1414, "Decrease Editor Font Size")),
             alias: 'Decrease Editor Font Size',
             precondition: undefined
         });
@@ -31,7 +31,7 @@ class EditorFontZoomReset extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomReset',
-            label: ( localize(1391, "Reset Editor Font Size")),
+            label: ( localize(1415, "Reset Editor Font Size")),
             alias: 'Reset Editor Font Size',
             precondition: undefined
         });

package/vscode/src/vs/editor/contrib/format/browser/formatActions.js

@@ -162,7 +162,7 @@ class FormatDocumentAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatDocument',
-            label: ( localize(1407, "Format Document")),
+            label: ( localize(1416, "Format Document")),
             alias: 'Format Document',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.notInCompositeEditor,
@@ -193,7 +193,7 @@ class FormatSelectionAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatSelection',
-            label: ( localize(1408, "Format Selection")),
+            label: ( localize(1417, "Format Selection")),
             alias: 'Format Selection',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,

package/vscode/src/vs/editor/contrib/gotoError/browser/gotoError.js

@@ -148,7 +148,7 @@ class MarkerNavigationAction extends EditorAction {
 }
 class NextMarkerAction extends MarkerNavigationAction {
     static { this.ID = 'editor.action.marker.next'; }
-    static { this.LABEL = ( localize(1445, "Go to Next Problem (Error, Warning, Info)")); }
+    static { this.LABEL = ( localize(1454, "Go to Next Problem (Error, Warning, Info)")); }
     constructor() {
         super(true, false, {
             id: NextMarkerAction.ID,
@@ -163,7 +163,7 @@ class NextMarkerAction extends MarkerNavigationAction {
             menuOpts: {
                 menuId: MarkerNavigationWidget.TitleMenu,
                 title: NextMarkerAction.LABEL,
-                icon: registerIcon('marker-navigation-next', Codicon.arrowDown, ( localize(1446, 'Icon for goto next marker.'))),
+                icon: registerIcon('marker-navigation-next', Codicon.arrowDown, ( localize(1455, 'Icon for goto next marker.'))),
                 group: 'navigation',
                 order: 1
             }
@@ -172,7 +172,7 @@ class NextMarkerAction extends MarkerNavigationAction {
 }
 class PrevMarkerAction extends MarkerNavigationAction {
     static { this.ID = 'editor.action.marker.prev'; }
-    static { this.LABEL = ( localize(1447, "Go to Previous Problem (Error, Warning, Info)")); }
+    static { this.LABEL = ( localize(1456, "Go to Previous Problem (Error, Warning, Info)")); }
     constructor() {
         super(false, false, {
             id: PrevMarkerAction.ID,
@@ -187,7 +187,7 @@ class PrevMarkerAction extends MarkerNavigationAction {
             menuOpts: {
                 menuId: MarkerNavigationWidget.TitleMenu,
                 title: PrevMarkerAction.LABEL,
-                icon: registerIcon('marker-navigation-previous', Codicon.arrowUp, ( localize(1448, 'Icon for goto previous marker.'))),
+                icon: registerIcon('marker-navigation-previous', Codicon.arrowUp, ( localize(1457, 'Icon for goto previous marker.'))),
                 group: 'navigation',
                 order: 2
             }
@@ -198,7 +198,7 @@ class NextMarkerInFilesAction extends MarkerNavigationAction {
     constructor() {
         super(true, true, {
             id: 'editor.action.marker.nextInFiles',
-            label: ( localize(1449, "Go to Next Problem in Files (Error, Warning, Info)")),
+            label: ( localize(1458, "Go to Next Problem in Files (Error, Warning, Info)")),
             alias: 'Go to Next Problem in Files (Error, Warning, Info)',
             precondition: undefined,
             kbOpts: {
@@ -208,7 +208,7 @@ class NextMarkerInFilesAction extends MarkerNavigationAction {
             },
             menuOpts: {
                 menuId: MenuId.MenubarGoMenu,
-                title: ( localize(1450, "Next &&Problem")),
+                title: ( localize(1459, "Next &&Problem")),
                 group: '6_problem_nav',
                 order: 1
             }
@@ -219,7 +219,7 @@ class PrevMarkerInFilesAction extends MarkerNavigationAction {
     constructor() {
         super(false, true, {
             id: 'editor.action.marker.prevInFiles',
-            label: ( localize(1451, "Go to Previous Problem in Files (Error, Warning, Info)")),
+            label: ( localize(1460, "Go to Previous Problem in Files (Error, Warning, Info)")),
             alias: 'Go to Previous Problem in Files (Error, Warning, Info)',
             precondition: undefined,
             kbOpts: {
@@ -229,7 +229,7 @@ class PrevMarkerInFilesAction extends MarkerNavigationAction {
             },
             menuOpts: {
                 menuId: MenuId.MenubarGoMenu,
-                title: ( localize(1452, "Previous &&Problem")),
+                title: ( localize(1461, "Previous &&Problem")),
                 group: '6_problem_nav',
                 order: 2
             }

package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js

@@ -176,20 +176,20 @@ class MessageWidget {
         let severityLabel = '';
         switch (marker.severity) {
             case MarkerSeverity.Error:
-                severityLabel = ( localize(5123, "Error"));
+                severityLabel = ( localize(5103, "Error"));
                 break;
             case MarkerSeverity.Warning:
-                severityLabel = ( localize(5124, "Warning"));
+                severityLabel = ( localize(5104, "Warning"));
                 break;
             case MarkerSeverity.Info:
-                severityLabel = ( localize(5125, "Info"));
+                severityLabel = ( localize(5105, "Info"));
                 break;
             case MarkerSeverity.Hint:
-                severityLabel = ( localize(5126, "Hint"));
+                severityLabel = ( localize(5106, "Hint"));
                 break;
         }
         let ariaLabel = ( localize(
-            5127,
+            5107,
             "{0} at {1}. ",
             severityLabel,
             marker.startLineNumber + ':' + marker.startColumn
@@ -298,8 +298,8 @@ let MarkerNavigationWidget = class MarkerNavigationWidget extends PeekViewWidget
         const model = this.editor.getModel();
         if (model) {
             const detail = markerCount > 1
-                ? ( localize(5128, "{0} of {1} problems", markerIdx, markerCount))
-                : ( localize(5129, "{0} of {1} problem", markerIdx, markerCount));
+                ? ( localize(5108, "{0} of {1} problems", markerIdx, markerCount))
+                : ( localize(5109, "{0} of {1} problem", markerIdx, markerCount));
             this.setTitle(basename(model.uri), detail);
         }
         this._icon.className = `codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(this._severity))}`;
@@ -341,11 +341,11 @@ MarkerNavigationWidget = MarkerNavigationWidget_1 = ( (__decorate([
 const errorDefault = oneOf(editorErrorForeground, editorErrorBorder);
 const warningDefault = oneOf(editorWarningForeground, editorWarningBorder);
 const infoDefault = oneOf(editorInfoForeground, editorInfoBorder);
-const editorMarkerNavigationError = registerColor('editorMarkerNavigationError.background', { dark: errorDefault, light: errorDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(5130, 'Editor marker navigation widget error color.')));
-const editorMarkerNavigationErrorHeader = registerColor('editorMarkerNavigationError.headerBackground', { dark: ( (transparent(editorMarkerNavigationError, .1))), light: ( (transparent(editorMarkerNavigationError, .1))), hcDark: null, hcLight: null }, ( localize(5131, 'Editor marker navigation widget error heading background.')));
-const editorMarkerNavigationWarning = registerColor('editorMarkerNavigationWarning.background', { dark: warningDefault, light: warningDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(5132, 'Editor marker navigation widget warning color.')));
-const editorMarkerNavigationWarningHeader = registerColor('editorMarkerNavigationWarning.headerBackground', { dark: ( (transparent(editorMarkerNavigationWarning, .1))), light: ( (transparent(editorMarkerNavigationWarning, .1))), hcDark: '#0C141F', hcLight: ( (transparent(editorMarkerNavigationWarning, .2))) }, ( localize(5133, 'Editor marker navigation widget warning heading background.')));
-const editorMarkerNavigationInfo = registerColor('editorMarkerNavigationInfo.background', { dark: infoDefault, light: infoDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(5134, 'Editor marker navigation widget info color.')));
-const editorMarkerNavigationInfoHeader = registerColor('editorMarkerNavigationInfo.headerBackground', { dark: ( (transparent(editorMarkerNavigationInfo, .1))), light: ( (transparent(editorMarkerNavigationInfo, .1))), hcDark: null, hcLight: null }, ( localize(5135, 'Editor marker navigation widget info heading background.')));
-const editorMarkerNavigationBackground = registerColor('editorMarkerNavigation.background', editorBackground, ( localize(5136, 'Editor marker navigation widget background.')));
+const editorMarkerNavigationError = registerColor('editorMarkerNavigationError.background', { dark: errorDefault, light: errorDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(5110, 'Editor marker navigation widget error color.')));
+const editorMarkerNavigationErrorHeader = registerColor('editorMarkerNavigationError.headerBackground', { dark: ( (transparent(editorMarkerNavigationError, .1))), light: ( (transparent(editorMarkerNavigationError, .1))), hcDark: null, hcLight: null }, ( localize(5111, 'Editor marker navigation widget error heading background.')));
+const editorMarkerNavigationWarning = registerColor('editorMarkerNavigationWarning.background', { dark: warningDefault, light: warningDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(5112, 'Editor marker navigation widget warning color.')));
+const editorMarkerNavigationWarningHeader = registerColor('editorMarkerNavigationWarning.headerBackground', { dark: ( (transparent(editorMarkerNavigationWarning, .1))), light: ( (transparent(editorMarkerNavigationWarning, .1))), hcDark: '#0C141F', hcLight: ( (transparent(editorMarkerNavigationWarning, .2))) }, ( localize(5113, 'Editor marker navigation widget warning heading background.')));
+const editorMarkerNavigationInfo = registerColor('editorMarkerNavigationInfo.background', { dark: infoDefault, light: infoDefault, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(5114, 'Editor marker navigation widget info color.')));
+const editorMarkerNavigationInfoHeader = registerColor('editorMarkerNavigationInfo.headerBackground', { dark: ( (transparent(editorMarkerNavigationInfo, .1))), light: ( (transparent(editorMarkerNavigationInfo, .1))), hcDark: null, hcLight: null }, ( localize(5115, 'Editor marker navigation widget info heading background.')));
+const editorMarkerNavigationBackground = registerColor('editorMarkerNavigation.background', editorBackground, ( localize(5116, 'Editor marker navigation widget background.')));
 export { MarkerNavigationWidget };