@codingame/monaco-vscode-api 21.6.0 → 22.0.1

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

@@ -56,7 +56,7 @@ class PeekViewService {
 }
 var PeekContext;
 (function (PeekContext) {
-    PeekContext.inPeekEditor = ( new RawContextKey('inReferenceSearchEditor', true, ( localize(1399, "Whether the current code editor is embedded inside peek"))));
+    PeekContext.inPeekEditor = ( new RawContextKey('inReferenceSearchEditor', true, ( localize(1402, "Whether the current code editor is embedded inside peek"))));
     PeekContext.notInPeekEditor = ( PeekContext.inPeekEditor.toNegated());
 })(PeekContext || (PeekContext = {}));
 let PeekContextController = class PeekContextController {
@@ -152,7 +152,7 @@ let PeekViewWidget = class PeekViewWidget extends ZoneWidget {
         this._actionbarWidget = ( new ActionBar(actionsContainer, actionBarOptions));
         this._disposables.add(this._actionbarWidget);
         if (!noCloseAction) {
-            this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(1400, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
+            this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(1403, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
                 this.dispose();
                 return Promise.resolve();
             }))), { label: false, icon: true });
@@ -216,30 +216,30 @@ let PeekViewWidget = class PeekViewWidget extends ZoneWidget {
 PeekViewWidget = ( __decorate([
     ( __param(2, IInstantiationService))
 ], PeekViewWidget));
-const peekViewTitleBackground = registerColor('peekViewTitle.background', { dark: '#252526', light: '#F3F3F3', hcDark: Color.black, hcLight: Color.white }, ( localize(1401, 'Background color of the peek view title area.')));
-const peekViewTitleForeground = registerColor('peekViewTitleLabel.foreground', { dark: Color.white, light: Color.black, hcDark: Color.white, hcLight: editorForeground }, ( localize(1402, 'Color of the peek view title.')));
-const peekViewTitleInfoForeground = registerColor('peekViewTitleDescription.foreground', { dark: '#ccccccb3', light: '#616161', hcDark: '#FFFFFF99', hcLight: '#292929' }, ( localize(1403, 'Color of the peek view title info.')));
-const peekViewBorder = registerColor('peekView.border', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(1404, 'Color of the peek view borders and arrow.')));
-const peekViewResultsBackground = registerColor('peekViewResult.background', { dark: '#252526', light: '#F3F3F3', hcDark: Color.black, hcLight: Color.white }, ( localize(1405, 'Background color of the peek view result list.')));
-registerColor('peekViewResult.lineForeground', { dark: '#bbbbbb', light: '#646465', hcDark: Color.white, hcLight: editorForeground }, ( localize(1406, 'Foreground color for line nodes in the peek view result list.')));
-registerColor('peekViewResult.fileForeground', { dark: Color.white, light: '#1E1E1E', hcDark: Color.white, hcLight: editorForeground }, ( localize(1407, 'Foreground color for file nodes in the peek view result list.')));
+const peekViewTitleBackground = registerColor('peekViewTitle.background', { dark: '#252526', light: '#F3F3F3', hcDark: Color.black, hcLight: Color.white }, ( localize(1404, 'Background color of the peek view title area.')));
+const peekViewTitleForeground = registerColor('peekViewTitleLabel.foreground', { dark: Color.white, light: Color.black, hcDark: Color.white, hcLight: editorForeground }, ( localize(1405, 'Color of the peek view title.')));
+const peekViewTitleInfoForeground = registerColor('peekViewTitleDescription.foreground', { dark: '#ccccccb3', light: '#616161', hcDark: '#FFFFFF99', hcLight: '#292929' }, ( localize(1406, 'Color of the peek view title info.')));
+const peekViewBorder = registerColor('peekView.border', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(1407, 'Color of the peek view borders and arrow.')));
+const peekViewResultsBackground = registerColor('peekViewResult.background', { dark: '#252526', light: '#F3F3F3', hcDark: Color.black, hcLight: Color.white }, ( localize(1408, 'Background color of the peek view result list.')));
+registerColor('peekViewResult.lineForeground', { dark: '#bbbbbb', light: '#646465', hcDark: Color.white, hcLight: editorForeground }, ( localize(1409, 'Foreground color for line nodes in the peek view result list.')));
+registerColor('peekViewResult.fileForeground', { dark: Color.white, light: '#1E1E1E', hcDark: Color.white, hcLight: editorForeground }, ( localize(1410, 'Foreground color for file nodes in the peek view result list.')));
 registerColor('peekViewResult.selectionBackground', { dark: '#3399ff33', light: '#3399ff33', hcDark: null, hcLight: null }, ( localize(
-    1408,
+    1411,
     'Background color of the selected entry in the peek view result list.'
 )));
 registerColor('peekViewResult.selectionForeground', { dark: Color.white, light: '#6C6C6C', hcDark: Color.white, hcLight: editorForeground }, ( localize(
-    1409,
+    1412,
     'Foreground color of the selected entry in the peek view result list.'
 )));
-const peekViewEditorBackground = registerColor('peekViewEditor.background', { dark: '#001F33', light: '#F2F8FC', hcDark: Color.black, hcLight: Color.white }, ( localize(1410, 'Background color of the peek view editor.')));
-registerColor('peekViewEditorGutter.background', peekViewEditorBackground, ( localize(1411, 'Background color of the gutter in the peek view editor.')));
-registerColor('peekViewEditorStickyScroll.background', peekViewEditorBackground, ( localize(1412, 'Background color of sticky scroll in the peek view editor.')));
+const peekViewEditorBackground = registerColor('peekViewEditor.background', { dark: '#001F33', light: '#F2F8FC', hcDark: Color.black, hcLight: Color.white }, ( localize(1413, 'Background color of the peek view editor.')));
+registerColor('peekViewEditorGutter.background', peekViewEditorBackground, ( localize(1414, 'Background color of the gutter in the peek view editor.')));
+registerColor('peekViewEditorStickyScroll.background', peekViewEditorBackground, ( localize(1415, 'Background color of sticky scroll in the peek view editor.')));
 registerColor('peekViewEditorStickyScrollGutter.background', peekViewEditorBackground, ( localize(
-    1413,
+    1416,
     'Background color of the gutter part of sticky scroll in the peek view editor.'
 )));
-registerColor('peekViewResult.matchHighlightBackground', { dark: '#ea5c004d', light: '#ea5c004d', hcDark: null, hcLight: null }, ( localize(1414, 'Match highlight color in the peek view result list.')));
-const peekViewEditorMatchHighlight = registerColor('peekViewEditor.matchHighlightBackground', { dark: '#ff8f0099', light: '#f5d802de', hcDark: null, hcLight: null }, ( localize(1415, 'Match highlight color in the peek view editor.')));
-registerColor('peekViewEditor.matchHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localize(1416, 'Match highlight border in the peek view editor.')));
+registerColor('peekViewResult.matchHighlightBackground', { dark: '#ea5c004d', light: '#ea5c004d', hcDark: null, hcLight: null }, ( localize(1417, 'Match highlight color in the peek view result list.')));
+const peekViewEditorMatchHighlight = registerColor('peekViewEditor.matchHighlightBackground', { dark: '#ff8f0099', light: '#f5d802de', hcDark: null, hcLight: null }, ( localize(1418, 'Match highlight color in the peek view editor.')));
+registerColor('peekViewEditor.matchHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localize(1419, 'Match highlight border in the peek view editor.')));
 
 export { PeekContext, PeekViewService, PeekViewWidget, peekViewBorder, peekViewEditorBackground, peekViewEditorMatchHighlight, peekViewResultsBackground, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground };

package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.js

@@ -10,4 +10,4 @@ import { wrapInReloadableClass1 } from '../../../../platform/observable/common/w
 
 registerCss(placeholderText);
 registerEditorContribution(PlaceholderTextContribution.ID, wrapInReloadableClass1(() => PlaceholderTextContribution), EditorContributionInstantiation.Eager);
-registerColor('editor.placeholder.foreground', ghostTextForeground, ( localize(1417, 'Foreground color of the placeholder text in the editor.')));
+registerColor('editor.placeholder.foreground', ghostTextForeground, ( localize(1420, 'Foreground color of the placeholder text in the editor.')));

package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js

@@ -19,10 +19,10 @@ class ReadOnlyMessageController extends Disposable {
             let message = this.editor.getOptions().get(EditorOption.readOnlyMessage);
             if (!message) {
                 if (this.editor.isSimpleWidget) {
-                    message = ( new MarkdownString(( localize(1455, "Cannot edit in read-only input"))));
+                    message = ( new MarkdownString(( localize(1458, "Cannot edit in read-only input"))));
                 }
                 else {
-                    message = ( new MarkdownString(( localize(1456, "Cannot edit in read-only editor"))));
+                    message = ( new MarkdownString(( localize(1459, "Cannot edit in read-only editor"))));
                 }
             }
             messageController.showMessage(message, this.editor.getPosition());

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

@@ -94,7 +94,7 @@ class RenameSkeleton {
         }
         const result = await provider.provideRenameEdits(this.model, this.position, newName, token);
         if (!result) {
-            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localize(1457, "No result."))), token);
+            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localize(1460, "No result."))), token);
         }
         else if (result.rejectReason) {
             return this._provideRenameEdits(newName, i + 1, rejects.concat(result.rejectReason), token);
@@ -172,7 +172,7 @@ let RenameController = class RenameController {
             else {
                 trace('resolve rename location failed', e instanceof Error ? e : JSON.stringify(e, null, '\t'));
                 if (typeof e === 'string' || isMarkdownString(e)) {
-                    MessageController.get(this.editor)?.showMessage(e || ( localize(1458, "An unknown error occurred while resolving rename location")), position);
+                    MessageController.get(this.editor)?.showMessage(e || ( localize(1461, "An unknown error occurred while resolving rename location")), position);
                 }
             }
             return undefined;
@@ -244,16 +244,16 @@ let RenameController = class RenameController {
             this._bulkEditService.apply(renameResult, {
                 editor: this.editor,
                 showPreview: inputFieldResult.wantsPreview,
-                label: ( localize(1459, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
+                label: ( localize(1462, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
                 code: 'undoredo.rename',
-                quotableLabel: ( localize(1460, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
+                quotableLabel: ( localize(1463, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
                 respectAutoSaveConfig: true,
                 reason: EditSources.rename(),
             }).then(result => {
                 trace('edits applied');
                 if (result.ariaSummary) {
                     alert(( localize(
-                        1461,
+                        1464,
                         "Successfully renamed '{0}' to '{1}'. Summary: {2}",
                         loc.text,
                         inputFieldResult.newName,
@@ -262,12 +262,12 @@ let RenameController = class RenameController {
                 }
             }).catch(err => {
                 trace(`error when applying edits ${JSON.stringify(err, null, '\t')}`);
-                this._notificationService.error(( localize(1462, "Rename failed to apply edits")));
+                this._notificationService.error(( localize(1465, "Rename failed to apply edits")));
                 this._logService.error(err);
             });
         }, err => {
             trace('error when providing rename edits', JSON.stringify(err, null, '\t'));
-            this._notificationService.error(( localize(1463, "Rename failed to compute edits")));
+            this._notificationService.error(( localize(1466, "Rename failed to compute edits")));
             this._logService.error(err);
         }).finally(() => {
             cts2.dispose();
@@ -302,7 +302,7 @@ class RenameAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.rename',
-            label: ( localize2(1464, "Rename Symbol")),
+            label: ( localize2(1467, "Rename Symbol")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasRenameProvider)),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -382,7 +382,7 @@ registerAction2(class FocusNextRenameSuggestion extends Action2 {
         super({
             id: 'focusNextRenameSuggestion',
             title: {
-                ...( localize2(1465, "Focus Next Rename Suggestion")),
+                ...( localize2(1468, "Focus Next Rename Suggestion")),
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
@@ -410,7 +410,7 @@ registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
         super({
             id: 'focusPreviousRenameSuggestion',
             title: {
-                ...( localize2(1466, "Focus Previous Rename Suggestion")),
+                ...( localize2(1469, "Focus Previous Rename Suggestion")),
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
@@ -453,7 +453,7 @@ registerModelAndPositionCommand('_executePrepareRename', async function (accesso
     properties: {
         'editor.rename.enablePreview': {
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            description: ( localize(1467, "Enable/disable the ability to preview changes before renaming")),
+            description: ( localize(1470, "Enable/disable the ability to preview changes before renaming")),
             default: true,
             type: 'boolean'
         }

package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js

@@ -44,7 +44,7 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 
 registerCss(renameWidget);
-const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey('renameInputVisible', false, ( localize(1468, "Whether the rename input widget is visible"))));
+const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey('renameInputVisible', false, ( localize(1471, "Whether the rename input widget is visible"))));
 let RenameWidget = class RenameWidget {
     constructor(_editor, _acceptKeybindings, _themeService, _keybindingService, contextKeyService, _logService) {
         this._editor = _editor;
@@ -167,7 +167,7 @@ let RenameWidget = class RenameWidget {
     beforeRender() {
         const [accept, preview] = this._acceptKeybindings;
         this._label.innerText = ( localize(
-            1469,
+            1472,
             "{0} to Rename, {1} to Preview",
             this._keybindingService.lookupKeybinding(accept)?.getLabel(),
             this._keybindingService.lookupKeybinding(preview)?.getLabel()
@@ -463,7 +463,7 @@ class RenameCandidateListView {
         this._listWidget.layout(height, width);
         this._listContainer.style.height = `${height}px`;
         this._listContainer.style.width = `${width}px`;
-        status(( localize(1470, "Received {0} rename suggestions", candidates.length)));
+        status(( localize(1473, "Received {0} rename suggestions", candidates.length)));
     }
     clearCandidates() {
         this._listContainer.style.height = '0px';
@@ -602,13 +602,13 @@ class InputWithButton {
             this._inputNode.className = 'rename-input';
             this._inputNode.type = 'text';
             this._inputNode.style.border = 'none';
-            this._inputNode.setAttribute('aria-label', ( localize(1471, "Rename input. Type new name and press Enter to commit.")));
+            this._inputNode.setAttribute('aria-label', ( localize(1474, "Rename input. Type new name and press Enter to commit.")));
             this._domNode.appendChild(this._inputNode);
             this._buttonNode = createElement('div');
             this._buttonNode.className = 'rename-suggestions-button';
             this._buttonNode.setAttribute('tabindex', '0');
-            this._buttonGenHoverText = ( localize(1472, "Generate new name suggestions"));
-            this._buttonCancelHoverText = ( localize(1473, "Cancel"));
+            this._buttonGenHoverText = ( localize(1475, "Generate new name suggestions"));
+            this._buttonCancelHoverText = ( localize(1476, "Cancel"));
             this._buttonHoverContent = this._buttonGenHoverText;
             this._disposables.add(getBaseLayerHoverDelegate().setupDelayedHover(this._buttonNode, () => ({
                 content: this._buttonHoverContent,

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

@@ -118,7 +118,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(true, {
             id: 'editor.action.smartSelect.expand',
-            label: ( localize2(1474, "Expand Selection")),
+            label: ( localize2(1477, "Expand Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -132,7 +132,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '1_basic',
-                title: ( localize(1475, "&&Expand Selection")),
+                title: ( localize(1478, "&&Expand Selection")),
                 order: 2
             }
         });
@@ -143,7 +143,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(false, {
             id: 'editor.action.smartSelect.shrink',
-            label: ( localize2(1476, "Shrink Selection")),
+            label: ( localize2(1479, "Shrink Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -157,7 +157,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: '1_basic',
-                title: ( localize(1477, "&&Shrink Selection")),
+                title: ( localize(1480, "&&Shrink Selection")),
                 order: 3
             }
         });

package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.d.ts

@@ -9,6 +9,7 @@ import { IContextKeyService } from "../../../../platform/contextkey/common/conte
 import { ILogService } from "../../../../platform/log/common/log.service.js";
 import { ISnippetEdit } from "./snippetSession.js";
 import { TextModelEditSource } from "../../../common/textModelEditSource.js";
+import { IObservable } from "../../../../base/common/observable.js";
 export interface ISnippetInsertOptions {
     overwriteBefore: number;
     overwriteAfter: number;
@@ -30,6 +31,7 @@ export declare class SnippetController2 implements IEditorContribution {
     static readonly HasNextTabstop: RawContextKey<false>;
     static readonly HasPrevTabstop: RawContextKey<false>;
     private readonly _inSnippet;
+    private readonly _inSnippetObservable;
     private readonly _hasNextTabstop;
     private readonly _hasPrevTabstop;
     private _session?;
@@ -49,5 +51,6 @@ export declare class SnippetController2 implements IEditorContribution {
     prev(): void;
     next(): void;
     isInSnippet(): boolean;
+    get isInSnippetObservable(): IObservable<boolean>;
     getSessionEnclosingRange(): Range | undefined;
 }

package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js

@@ -16,6 +16,8 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { SnippetSession } from './snippetSession.js';
+import '../../../../base/common/observableInternal/index.js';
+import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 
 var SnippetController2_1;
 const _defaultOptions = {
@@ -33,14 +35,15 @@ let SnippetController2 = class SnippetController2 {
     static get(editor) {
         return editor.getContribution(SnippetController2_1.ID);
     }
-    static { this.InSnippetMode = ( new RawContextKey('inSnippetMode', false, ( localize(1478, "Whether the editor in current in snippet mode")))); }
-    static { this.HasNextTabstop = ( new RawContextKey('hasNextTabstop', false, ( localize(1479, "Whether there is a next tab stop when in snippet mode")))); }
-    static { this.HasPrevTabstop = ( new RawContextKey('hasPrevTabstop', false, ( localize(1480, "Whether there is a previous tab stop when in snippet mode")))); }
+    static { this.InSnippetMode = ( new RawContextKey('inSnippetMode', false, ( localize(1481, "Whether the editor in current in snippet mode")))); }
+    static { this.HasNextTabstop = ( new RawContextKey('hasNextTabstop', false, ( localize(1482, "Whether there is a next tab stop when in snippet mode")))); }
+    static { this.HasPrevTabstop = ( new RawContextKey('hasPrevTabstop', false, ( localize(1483, "Whether there is a previous tab stop when in snippet mode")))); }
     constructor(_editor, _logService, _languageFeaturesService, contextKeyService, _languageConfigurationService) {
         this._editor = _editor;
         this._logService = _logService;
         this._languageFeaturesService = _languageFeaturesService;
         this._languageConfigurationService = _languageConfigurationService;
+        this._inSnippetObservable = observableValue(this, false);
         this._snippetListener = ( new DisposableStore());
         this._modelVersionId = -1;
         this._inSnippet = SnippetController2_1.InSnippetMode.bindTo(contextKeyService);
@@ -49,6 +52,7 @@ let SnippetController2 = class SnippetController2 {
     }
     dispose() {
         this._inSnippet.reset();
+        this._inSnippetObservable.set(false, undefined);
         this._hasPrevTabstop.reset();
         this._hasNextTabstop.reset();
         this._session?.dispose();
@@ -124,7 +128,7 @@ let SnippetController2 = class SnippetController2 {
                             sortText: 'a'.repeat(i + 1),
                             range: activeChoice.range,
                             filterText: isAnyOfOptions ? `${word}_${option.value}` : undefined,
-                            command: { id: 'jumpToNextSnippetPlaceholder', title: ( localize(1481, 'Go to next placeholder...')) }
+                            command: { id: 'jumpToNextSnippetPlaceholder', title: ( localize(1484, 'Go to next placeholder...')) }
                         });
                     }
                     return { suggestions };
@@ -171,6 +175,7 @@ let SnippetController2 = class SnippetController2 {
             return this.cancel();
         }
         this._inSnippet.set(true);
+        this._inSnippetObservable.set(true, undefined);
         this._hasPrevTabstop.set(!this._session.isAtFirstPlaceholder);
         this._hasNextTabstop.set(!this._session.isAtLastPlaceholder);
         this._handleChoice();
@@ -201,6 +206,7 @@ let SnippetController2 = class SnippetController2 {
     }
     cancel(resetSelection = false) {
         this._inSnippet.reset();
+        this._inSnippetObservable.set(false, undefined);
         this._hasPrevTabstop.reset();
         this._hasNextTabstop.reset();
         this._snippetListener.clear();
@@ -223,6 +229,9 @@ let SnippetController2 = class SnippetController2 {
     isInSnippet() {
         return Boolean(this._inSnippet.get());
     }
+    get isInSnippetObservable() {
+        return this._inSnippetObservable;
+    }
     getSessionEnclosingRange() {
         if (this._session) {
             return this._session.getEnclosingRange();

package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.js

@@ -214,10 +214,10 @@ class TimeBasedVariableResolver {
     constructor() {
         this._date = ( new Date());
     }
-    static { this.dayNames = [( localize(1482, "Sunday")), ( localize(1483, "Monday")), ( localize(1484, "Tuesday")), ( localize(1485, "Wednesday")), ( localize(1486, "Thursday")), ( localize(1487, "Friday")), ( localize(1488, "Saturday"))]; }
-    static { this.dayNamesShort = [( localize(1489, "Sun")), ( localize(1490, "Mon")), ( localize(1491, "Tue")), ( localize(1492, "Wed")), ( localize(1493, "Thu")), ( localize(1494, "Fri")), ( localize(1495, "Sat"))]; }
-    static { this.monthNames = [( localize(1496, "January")), ( localize(1497, "February")), ( localize(1498, "March")), ( localize(1499, "April")), ( localize(1500, "May")), ( localize(1501, "June")), ( localize(1502, "July")), ( localize(1503, "August")), ( localize(1504, "September")), ( localize(1505, "October")), ( localize(1506, "November")), ( localize(1507, "December"))]; }
-    static { this.monthNamesShort = [( localize(1508, "Jan")), ( localize(1509, "Feb")), ( localize(1510, "Mar")), ( localize(1511, "Apr")), ( localize(1512, "May")), ( localize(1513, "Jun")), ( localize(1514, "Jul")), ( localize(1515, "Aug")), ( localize(1516, "Sep")), ( localize(1517, "Oct")), ( localize(1518, "Nov")), ( localize(1519, "Dec"))]; }
+    static { this.dayNames = [( localize(1485, "Sunday")), ( localize(1486, "Monday")), ( localize(1487, "Tuesday")), ( localize(1488, "Wednesday")), ( localize(1489, "Thursday")), ( localize(1490, "Friday")), ( localize(1491, "Saturday"))]; }
+    static { this.dayNamesShort = [( localize(1492, "Sun")), ( localize(1493, "Mon")), ( localize(1494, "Tue")), ( localize(1495, "Wed")), ( localize(1496, "Thu")), ( localize(1497, "Fri")), ( localize(1498, "Sat"))]; }
+    static { this.monthNames = [( localize(1499, "January")), ( localize(1500, "February")), ( localize(1501, "March")), ( localize(1502, "April")), ( localize(1503, "May")), ( localize(1504, "June")), ( localize(1505, "July")), ( localize(1506, "August")), ( localize(1507, "September")), ( localize(1508, "October")), ( localize(1509, "November")), ( localize(1510, "December"))]; }
+    static { this.monthNamesShort = [( localize(1511, "Jan")), ( localize(1512, "Feb")), ( localize(1513, "Mar")), ( localize(1514, "Apr")), ( localize(1515, "May")), ( localize(1516, "Jun")), ( localize(1517, "Jul")), ( localize(1518, "Aug")), ( localize(1519, "Sep")), ( localize(1520, "Oct")), ( localize(1521, "Nov")), ( localize(1522, "Dec"))]; }
     resolve(variable) {
         const { name } = variable;
         if (name === 'CURRENT_YEAR') {

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js

@@ -15,20 +15,20 @@ class ToggleStickyScroll extends EditorAction2 {
         super({
             id: 'editor.action.toggleStickyScroll',
             title: {
-                ...( localize2(1520, "Toggle Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1521, "&&Toggle Editor Sticky Scroll")),
+                ...( localize2(1523, "Toggle Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1524, "&&Toggle Editor Sticky Scroll")),
             },
             metadata: {
                 description: ( localize2(
-                    1522,
+                    1525,
                     "Toggle/enable the editor sticky scroll which shows the nested scopes at the top of the viewport"
                 )),
             },
             category: Categories.View,
             toggled: {
                 condition: ( ContextKeyExpr.equals('config.editor.stickyScroll.enabled', true)),
-                title: ( localize(1523, "Sticky Scroll")),
-                mnemonicTitle: ( localize(1524, "&&Sticky Scroll")),
+                title: ( localize(1526, "Sticky Scroll")),
+                mnemonicTitle: ( localize(1527, "&&Sticky Scroll")),
             },
             menu: [
                 { id: MenuId.CommandPalette },
@@ -53,8 +53,8 @@ class FocusStickyScroll extends EditorAction2 {
         super({
             id: 'editor.action.focusStickyScroll',
             title: {
-                ...( localize2(1525, "Focus Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1526, "&&Focus Editor Sticky Scroll")),
+                ...( localize2(1528, "Focus Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1529, "&&Focus Editor Sticky Scroll")),
             },
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.has('config.editor.stickyScroll.enabled')), EditorContextKeys.stickyScrollVisible)),
             menu: [
@@ -70,7 +70,7 @@ class SelectNextStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectNextStickyScrollLine',
-            title: ( localize2(1527, "Select the next editor sticky scroll line")),
+            title: ( localize2(1530, "Select the next editor sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -86,7 +86,7 @@ class SelectPreviousStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectPreviousStickyScrollLine',
-            title: ( localize2(1528, "Select the previous sticky scroll line")),
+            title: ( localize2(1531, "Select the previous sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -102,7 +102,7 @@ class GoToStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.goToFocusedStickyScrollLine',
-            title: ( localize2(1529, "Go to the focused sticky scroll line")),
+            title: ( localize2(1532, "Go to the focused sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -118,7 +118,7 @@ class SelectEditor extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectEditor',
-            title: ( localize2(1530, "Select Editor")),
+            title: ( localize2(1533, "Select Editor")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js

@@ -497,10 +497,6 @@ let StickyScrollController = class StickyScrollController extends Disposable {
         this._stickyScrollWidget.setState(undefined, undefined);
     }
     findScrollWidgetState() {
-        if (!this._editor.hasModel()) {
-            return StickyScrollWidgetState.Empty;
-        }
-        const textModel = this._editor.getModel();
         const maxNumberStickyLines = Math.min(this._maxStickyLines, this._editor.getOption(EditorOption.stickyScroll).maxLineCount);
         const scrollTop = this._editor.getScrollTop();
         let lastLineRelativePosition = 0;
@@ -516,23 +512,20 @@ let StickyScrollController = class StickyScrollController extends Disposable {
             for (const range of candidateRanges) {
                 const start = range.startLineNumber;
                 const end = range.endLineNumber;
-                const isValidRange = textModel.isValidRange({ startLineNumber: start, endLineNumber: end, startColumn: 1, endColumn: 1 });
-                if (isValidRange && end - start > 0) {
-                    const topOfElement = range.top;
-                    const bottomOfElement = topOfElement + range.height;
-                    const topOfBeginningLine = this._editor.getTopForLineNumber(start) - scrollTop;
-                    const bottomOfEndLine = this._editor.getBottomForLineNumber(end) - scrollTop;
-                    if (topOfElement > topOfBeginningLine && topOfElement <= bottomOfEndLine) {
-                        startLineNumbers.push(start);
-                        endLineNumbers.push(end + 1);
-                        if (bottomOfElement > bottomOfEndLine) {
-                            lastLineRelativePosition = bottomOfEndLine - bottomOfElement;
-                        }
-                    }
-                    if (startLineNumbers.length === maxNumberStickyLines) {
-                        break;
+                const topOfElement = range.top;
+                const bottomOfElement = topOfElement + range.height;
+                const topOfBeginningLine = this._editor.getTopForLineNumber(start) - scrollTop;
+                const bottomOfEndLine = this._editor.getBottomForLineNumber(end) - scrollTop;
+                if (topOfElement > topOfBeginningLine && topOfElement <= bottomOfEndLine) {
+                    startLineNumbers.push(start);
+                    endLineNumbers.push(end + 1);
+                    if (bottomOfElement > bottomOfEndLine) {
+                        lastLineRelativePosition = bottomOfEndLine - bottomOfElement;
                     }
                 }
+                if (startLineNumbers.length === maxNumberStickyLines) {
+                    break;
+                }
             }
         }
         this._endLineNumbers = endLineNumbers;

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.js

@@ -10,6 +10,7 @@ import { Emitter } from '../../../../base/common/event.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.service.js';
 import { StickyModelProvider } from './stickyScrollModelProvider.js';
 import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
 
 class StickyLineCandidate {
     constructor(startLineNumber, endLineNumber, top, height) {
@@ -102,6 +103,10 @@ let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disp
         return this.filterHiddenRanges(stickyLineCandidates);
     }
     getCandidateStickyLinesIntersectingFromStickyModel(range, outlineModel, result, depth, top, lastStartLineNumber) {
+        const textModel = this._editor.getModel();
+        if (!textModel) {
+            return;
+        }
         if (outlineModel.children.length === 0) {
             return;
         }
@@ -121,7 +126,11 @@ let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disp
                 continue;
             }
             const { startLineNumber, endLineNumber } = child.range;
-            if (range.startLineNumber <= endLineNumber + 1 && startLineNumber - 1 <= range.endLineNumber && startLineNumber !== lastLine) {
+            if (endLineNumber > startLineNumber + 1
+                && range.startLineNumber <= endLineNumber + 1
+                && startLineNumber - 1 <= range.endLineNumber
+                && startLineNumber !== lastLine
+                && textModel.isValidRange(( new Range(startLineNumber, 1, endLineNumber, 1)))) {
                 lastLine = startLineNumber;
                 const lineHeight = this._editor.getLineHeightForPosition(( new Position(startLineNumber, 1)));
                 result.push(( new StickyLineCandidate(startLineNumber, endLineNumber - 1, top, lineHeight)));

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

@@ -21,21 +21,21 @@ import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
 
 const Context = {
     Visible: historyNavigationVisible,
-    HasFocusedSuggestion: ( new RawContextKey('suggestWidgetHasFocusedSuggestion', false, ( localize(1531, "Whether any suggestion is focused")))),
-    DetailsVisible: ( new RawContextKey('suggestWidgetDetailsVisible', false, ( localize(1532, "Whether suggestion details are visible")))),
-    MultipleSuggestions: ( new RawContextKey('suggestWidgetMultipleSuggestions', false, ( localize(1533, "Whether there are multiple suggestions to pick from")))),
+    HasFocusedSuggestion: ( new RawContextKey('suggestWidgetHasFocusedSuggestion', false, ( localize(1534, "Whether any suggestion is focused")))),
+    DetailsVisible: ( new RawContextKey('suggestWidgetDetailsVisible', false, ( localize(1535, "Whether suggestion details are visible")))),
+    MultipleSuggestions: ( new RawContextKey('suggestWidgetMultipleSuggestions', false, ( localize(1536, "Whether there are multiple suggestions to pick from")))),
     MakesTextEdit: ( new RawContextKey('suggestionMakesTextEdit', true, ( localize(
-        1534,
+        1537,
         "Whether inserting the current suggestion yields in a change or has everything already been typed"
     )))),
-    AcceptSuggestionsOnEnter: ( new RawContextKey('acceptSuggestionOnEnter', true, ( localize(1535, "Whether suggestions are inserted when pressing Enter")))),
-    HasInsertAndReplaceRange: ( new RawContextKey('suggestionHasInsertAndReplaceRange', false, ( localize(1536, "Whether the current suggestion has insert and replace behaviour")))),
+    AcceptSuggestionsOnEnter: ( new RawContextKey('acceptSuggestionOnEnter', true, ( localize(1538, "Whether suggestions are inserted when pressing Enter")))),
+    HasInsertAndReplaceRange: ( new RawContextKey('suggestionHasInsertAndReplaceRange', false, ( localize(1539, "Whether the current suggestion has insert and replace behaviour")))),
     InsertMode: ( new RawContextKey(
         'suggestionInsertMode',
         undefined,
-        { type: 'string', description: ( localize(1537, "Whether the default behaviour is to insert or replace")) }
+        { type: 'string', description: ( localize(1540, "Whether the default behaviour is to insert or replace")) }
     )),
-    CanResolve: ( new RawContextKey('suggestionCanResolve', false, ( localize(1538, "Whether the current suggestion supports to resolve further details")))),
+    CanResolve: ( new RawContextKey('suggestionCanResolve', false, ( localize(1541, "Whether the current suggestion supports to resolve further details")))),
 };
 const suggestWidgetStatusbarMenu = ( new MenuId('suggestWidgetStatusBar'));
 class CompletionItem {