@codingame/monaco-vscode-api 32.0.2 → 33.0.3

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

@@ -13,7 +13,7 @@ import { showSimpleSuggestions } from '../../suggest/browser/suggest.js';
 import { localize } from '../../../../nls.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingWeight, KeybindingsRegistry } 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';
@@ -48,6 +48,9 @@ let SnippetController2 = class SnippetController2 {
     static {
         this.HasPrevTabstop = ( new RawContextKey("hasPrevTabstop", false, ( localize(1549, "Whether there is a previous tab stop when in snippet mode"))));
     }
+    static {
+        this.InSnippetChoice = ( new RawContextKey("inSnippetChoice", false, ( localize(1550, "Whether the current snippet tab stop is a choice"))));
+    }
     constructor(
         _editor,
         _logService,
@@ -65,12 +68,14 @@ let SnippetController2 = class SnippetController2 {
         this._inSnippet = SnippetController2_1.InSnippetMode.bindTo(contextKeyService);
         this._hasNextTabstop = SnippetController2_1.HasNextTabstop.bindTo(contextKeyService);
         this._hasPrevTabstop = SnippetController2_1.HasPrevTabstop.bindTo(contextKeyService);
+        this._inSnippetChoice = SnippetController2_1.InSnippetChoice.bindTo(contextKeyService);
     }
     dispose() {
         this._inSnippet.reset();
         this._inSnippetObservable.set(false, undefined);
         this._hasPrevTabstop.reset();
         this._hasNextTabstop.reset();
+        this._inSnippetChoice.reset();
         this._session?.dispose();
         this._snippetListener.dispose();
     }
@@ -157,7 +162,7 @@ let SnippetController2 = class SnippetController2 {
                             filterText: isAnyOfOptions ? `${word}_${option.value}` : undefined,
                             command: {
                                 id: "jumpToNextSnippetPlaceholder",
-                                title: ( localize(1550, "Go to next placeholder..."))
+                                title: ( localize(1551, "Go to next placeholder..."))
                             }
                         });
                     }
@@ -219,6 +224,7 @@ let SnippetController2 = class SnippetController2 {
     _handleChoice() {
         if (!this._session || !this._editor.hasModel()) {
             this._currentChoice = undefined;
+            this._inSnippetChoice.reset();
             return;
         }
         const {
@@ -227,8 +233,10 @@ let SnippetController2 = class SnippetController2 {
         if (!activeChoice || !this._choiceCompletions) {
             this._choiceCompletions?.disable();
             this._currentChoice = undefined;
+            this._inSnippetChoice.reset();
             return;
         }
+        this._inSnippetChoice.set(true);
         if (this._currentChoice !== activeChoice.choice) {
             this._currentChoice = activeChoice.choice;
             this._choiceCompletions.enable();
@@ -247,6 +255,7 @@ let SnippetController2 = class SnippetController2 {
         this._inSnippetObservable.set(false, undefined);
         this._hasPrevTabstop.reset();
         this._hasNextTabstop.reset();
+        this._inSnippetChoice.reset();
         this._snippetListener.clear();
         this._currentChoice = undefined;
         this._session?.dispose();
@@ -304,6 +313,17 @@ registerEditorCommand(( new CommandCtor({
         primary: KeyMod$1.Shift | KeyCode.Tab
     }
 })));
+KeybindingsRegistry.registerKeybindingRule({
+    id: "jumpToPrevSnippetPlaceholder",
+    weight: KeybindingWeight.EditorContrib + 91,
+    when: ( ContextKeyExpr.and(
+        SnippetController2.InSnippetMode,
+        SnippetController2.HasPrevTabstop,
+        SnippetController2.InSnippetChoice,
+        EditorContextKeys.textInputFocus
+    )),
+    primary: KeyMod$1.Shift | KeyCode.Tab
+});
 registerEditorCommand(( new CommandCtor({
     id: "leaveSnippet",
     precondition: SnippetController2.InSnippetMode,

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

@@ -40,6 +40,7 @@ export declare class OneSnippet {
     get hasChoice(): boolean;
     get activePlaceholderCount(): number;
     merge(others: OneSnippet[]): void;
+    private _renormalizePlaceholderIndices;
     getEnclosingRange(): Range | undefined;
 }
 export interface ISnippetSessionInsertOptions {

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

@@ -9,13 +9,13 @@ import * as snippetSession from './snippetSession.css';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
 import { Range } from '../../../common/core/range.js';
-import { Selection } from '../../../common/core/selection.js';
+import { Selection, SelectionDirection } from '../../../common/core/selection.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.service.js';
 import { TrackedRangeStickiness } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
-import { Placeholder, Choice, Text, SnippetParser, TextmateSnippet } from './snippetParser.js';
+import { Placeholder, Choice, Text, SnippetParser, TextmateSnippet, Variable } from './snippetParser.js';
 import { ModelBasedVariableResolver, CompositeSnippetVariableResolver, ClipboardBasedVariableResolver, SelectionBasedVariableResolver, CommentBasedVariableResolver, TimeBasedVariableResolver, WorkspaceBasedVariableResolver, RandomBasedVariableResolver } from './snippetVariables.js';
 import { EditSources } from '../../../common/textModelEditSource.js';
 
@@ -290,9 +290,30 @@ class OneSnippet {
                     this._placeholderDecorations.set(placeholder, handle);
                 }
             }
+            this._renormalizePlaceholderIndices();
             this._placeholderGroups = groupBy(this._snippet.placeholders, Placeholder.compareByIndex);
         });
     }
+    _renormalizePlaceholderIndices() {
+        const placeholders = this._snippet.placeholders;
+        const uniqueIndices = ( new Set());
+        for (const placeholder of placeholders) {
+            if (!placeholder.isFinalTabstop) {
+                uniqueIndices.add(placeholder.index);
+            }
+        }
+        const sorted = [...uniqueIndices].sort((a, b) => a - b);
+        const remap = ( new Map());
+        for (let i = 0; i < sorted.length; i++) {
+            remap.set(sorted[i], i + 1);
+        }
+        for (const placeholder of placeholders) {
+            if (!placeholder.isFinalTabstop) {
+                placeholder.index = remap.get(placeholder.index);
+            }
+        }
+        this._nestingLevel = 1;
+    }
     getEnclosingRange() {
         let result;
         const model = this._editor.getModel();
@@ -468,29 +489,42 @@ let SnippetSession = SnippetSession_1 = class SnippetSession {
         const model = editor.getModel();
         const parser = ( new SnippetParser());
         const snippet = ( new TextmateSnippet());
-        const resolver = ( new CompositeSnippetVariableResolver([editor.invokeWithinContext(accessor => ( new ModelBasedVariableResolver(accessor.get(ILabelService), model))), ( new ClipboardBasedVariableResolver(
-            () => clipboardText,
-            0,
-            editor.getSelections().length,
-            editor.getOption(EditorOption.multiCursorPaste) === "spread"
-        )), ( new SelectionBasedVariableResolver(model, editor.getSelection(), 0, overtypingCapturer)), ( new CommentBasedVariableResolver(model, editor.getSelection(), languageConfigurationService)), ( new TimeBasedVariableResolver()), ( new WorkspaceBasedVariableResolver(
+        const modelBasedVariableResolver = editor.invokeWithinContext(accessor => ( new ModelBasedVariableResolver(accessor.get(ILabelService), model)));
+        const timeBasedVariableResolver = ( new TimeBasedVariableResolver());
+        const workspaceBasedVariableResolver = ( new WorkspaceBasedVariableResolver(
             editor.invokeWithinContext(accessor => accessor.get(IWorkspaceContextService))
-        )), ( new RandomBasedVariableResolver())]));
-        snippetEdits = snippetEdits.sort((a, b) => Range.compareRangesUsingStarts(a.range, b.range));
+        ));
+        const randomBasedVariableResolver = ( new RandomBasedVariableResolver());
+        const readClipboardText = () => clipboardText;
+        const clipboardSpread = editor.getOption(EditorOption.multiCursorPaste) === "spread";
+        const indexedSnippetEdits = ( snippetEdits.map((edit, idx) => ({
+            edit,
+            idx
+        }))).sort((a, b) => Range.compareRangesUsingStarts(a.edit.range, b.edit.range));
         let offset = 0;
-        for (let i = 0; i < snippetEdits.length; i++) {
+        for (let i = 0; i < indexedSnippetEdits.length; i++) {
             const {
-                range,
-                template,
-                keepWhitespace
-            } = snippetEdits[i];
+                edit: {
+                    range,
+                    template,
+                    keepWhitespace
+                },
+                idx
+            } = indexedSnippetEdits[i];
             if (i > 0) {
-                const lastRange = snippetEdits[i - 1].range;
+                const lastRange = indexedSnippetEdits[i - 1].edit.range;
                 const textRange = Range.fromPositions(lastRange.getEndPosition(), range.getStartPosition());
                 const textNode = ( new Text(model.getValueInRange(textRange)));
                 snippet.appendChild(textNode);
                 offset += textNode.value.length;
             }
+            const preExistingVariables = ( new Set());
+            snippet.walk(marker => {
+                if (marker instanceof Variable) {
+                    preExistingVariables.add(marker);
+                }
+                return true;
+            });
             const newNodes = parser.parseFragment(template, snippet);
             SnippetSession_1.adjustWhitespace(
                 model,
@@ -499,7 +533,14 @@ let SnippetSession = SnippetSession_1 = class SnippetSession {
                 snippet,
                 ( new Set(newNodes))
             );
-            snippet.resolveVariables(resolver);
+            const editSelection = Selection.fromRange(range, SelectionDirection.LTR);
+            const editResolver = ( new CompositeSnippetVariableResolver([modelBasedVariableResolver, ( new ClipboardBasedVariableResolver(readClipboardText, idx, indexedSnippetEdits.length, clipboardSpread)), ( new SelectionBasedVariableResolver(model, editSelection, idx, overtypingCapturer)), ( new CommentBasedVariableResolver(model, editSelection, languageConfigurationService)), timeBasedVariableResolver, workspaceBasedVariableResolver, randomBasedVariableResolver]));
+            snippet.walk(marker => {
+                if (marker instanceof Variable && !( preExistingVariables.has(marker))) {
+                    marker.resolve(editResolver);
+                }
+                return true;
+            });
             const snippetText = ( snippet.toString());
             const snippetFragmentText = snippetText.slice(offset);
             offset = snippetText.length;

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

@@ -224,16 +224,16 @@ class TimeBasedVariableResolver {
         this._date = ( new Date());
     }
     static {
-        this.dayNames = [( localize(1551, "Sunday")), ( localize(1552, "Monday")), ( localize(1553, "Tuesday")), ( localize(1554, "Wednesday")), ( localize(1555, "Thursday")), ( localize(1556, "Friday")), ( localize(1557, "Saturday"))];
+        this.dayNames = [( localize(1552, "Sunday")), ( localize(1553, "Monday")), ( localize(1554, "Tuesday")), ( localize(1555, "Wednesday")), ( localize(1556, "Thursday")), ( localize(1557, "Friday")), ( localize(1558, "Saturday"))];
     }
     static {
-        this.dayNamesShort = [( localize(1558, "Sun")), ( localize(1559, "Mon")), ( localize(1560, "Tue")), ( localize(1561, "Wed")), ( localize(1562, "Thu")), ( localize(1563, "Fri")), ( localize(1564, "Sat"))];
+        this.dayNamesShort = [( localize(1559, "Sun")), ( localize(1560, "Mon")), ( localize(1561, "Tue")), ( localize(1562, "Wed")), ( localize(1563, "Thu")), ( localize(1564, "Fri")), ( localize(1565, "Sat"))];
     }
     static {
-        this.monthNames = [( localize(1565, "January")), ( localize(1566, "February")), ( localize(1567, "March")), ( localize(1568, "April")), ( localize(1569, "May")), ( localize(1570, "June")), ( localize(1571, "July")), ( localize(1572, "August")), ( localize(1573, "September")), ( localize(1574, "October")), ( localize(1575, "November")), ( localize(1576, "December"))];
+        this.monthNames = [( localize(1566, "January")), ( localize(1567, "February")), ( localize(1568, "March")), ( localize(1569, "April")), ( localize(1570, "May")), ( localize(1571, "June")), ( localize(1572, "July")), ( localize(1573, "August")), ( localize(1574, "September")), ( localize(1575, "October")), ( localize(1576, "November")), ( localize(1577, "December"))];
     }
     static {
-        this.monthNamesShort = [( localize(1577, "Jan")), ( localize(1578, "Feb")), ( localize(1579, "Mar")), ( localize(1580, "Apr")), ( localize(1581, "May")), ( localize(1582, "Jun")), ( localize(1583, "Jul")), ( localize(1584, "Aug")), ( localize(1585, "Sep")), ( localize(1586, "Oct")), ( localize(1587, "Nov")), ( localize(1588, "Dec"))];
+        this.monthNamesShort = [( localize(1578, "Jan")), ( localize(1579, "Feb")), ( localize(1580, "Mar")), ( localize(1581, "Apr")), ( localize(1582, "May")), ( localize(1583, "Jun")), ( localize(1584, "Jul")), ( localize(1585, "Aug")), ( localize(1586, "Sep")), ( localize(1587, "Oct")), ( localize(1588, "Nov")), ( localize(1589, "Dec"))];
     }
     resolve(variable) {
         const {

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(1589, "Toggle Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1590, "&&Toggle Editor Sticky Scroll"))
+                ...( localize2(1590, "Toggle Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1591, "&&Toggle Editor Sticky Scroll"))
             },
             metadata: {
                 description: ( localize2(
-                    1591,
+                    1592,
                     "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(1592, "Sticky Scroll")),
-                mnemonicTitle: ( localize(1593, "&&Sticky Scroll"))
+                title: ( localize(1593, "Sticky Scroll")),
+                mnemonicTitle: ( localize(1594, "&&Sticky Scroll"))
             },
             menu: [{
                 id: MenuId.CommandPalette
@@ -57,8 +57,8 @@ class FocusStickyScroll extends EditorAction2 {
         super({
             id: "editor.action.focusStickyScroll",
             title: {
-                ...( localize2(1594, "Focus Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1595, "&&Focus Editor Sticky Scroll"))
+                ...( localize2(1595, "Focus Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1596, "&&Focus Editor Sticky Scroll"))
             },
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.has("config.editor.stickyScroll.enabled")), EditorContextKeys.stickyScrollVisible)),
             menu: [{
@@ -74,7 +74,7 @@ class SelectNextStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: "editor.action.selectNextStickyScrollLine",
-            title: ( localize2(1596, "Select the next editor sticky scroll line")),
+            title: ( localize2(1597, "Select the next editor sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -90,7 +90,7 @@ class SelectPreviousStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: "editor.action.selectPreviousStickyScrollLine",
-            title: ( localize2(1597, "Select the previous sticky scroll line")),
+            title: ( localize2(1598, "Select the previous sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -106,7 +106,7 @@ class GoToStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: "editor.action.goToFocusedStickyScrollLine",
-            title: ( localize2(1598, "Go to the focused sticky scroll line")),
+            title: ( localize2(1599, "Go to the focused sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -122,7 +122,7 @@ class SelectEditor extends EditorAction2 {
     constructor() {
         super({
             id: "editor.action.selectEditor",
-            title: ( localize2(1599, "Select Editor")),
+            title: ( localize2(1600, "Select Editor")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,

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(1600, "Whether any suggestion is focused")))),
-    DetailsVisible: ( new RawContextKey("suggestWidgetDetailsVisible", false, ( localize(1601, "Whether suggestion details are visible")))),
-    DetailsFocused: ( new RawContextKey("suggestWidgetDetailsFocused", false, ( localize(1602, "Whether the details pane of the suggest widget has focus")))),
-    MultipleSuggestions: ( new RawContextKey("suggestWidgetMultipleSuggestions", false, ( localize(1603, "Whether there are multiple suggestions to pick from")))),
+    HasFocusedSuggestion: ( new RawContextKey("suggestWidgetHasFocusedSuggestion", false, ( localize(1601, "Whether any suggestion is focused")))),
+    DetailsVisible: ( new RawContextKey("suggestWidgetDetailsVisible", false, ( localize(1602, "Whether suggestion details are visible")))),
+    DetailsFocused: ( new RawContextKey("suggestWidgetDetailsFocused", false, ( localize(1603, "Whether the details pane of the suggest widget has focus")))),
+    MultipleSuggestions: ( new RawContextKey("suggestWidgetMultipleSuggestions", false, ( localize(1604, "Whether there are multiple suggestions to pick from")))),
     MakesTextEdit: ( new RawContextKey("suggestionMakesTextEdit", true, ( localize(
-        1604,
+        1605,
         "Whether inserting the current suggestion yields in a change or has everything already been typed"
     )))),
-    AcceptSuggestionsOnEnter: ( new RawContextKey("acceptSuggestionOnEnter", true, ( localize(1605, "Whether suggestions are inserted when pressing Enter")))),
-    HasInsertAndReplaceRange: ( new RawContextKey("suggestionHasInsertAndReplaceRange", false, ( localize(1606, "Whether the current suggestion has insert and replace behaviour")))),
+    AcceptSuggestionsOnEnter: ( new RawContextKey("acceptSuggestionOnEnter", true, ( localize(1606, "Whether suggestions are inserted when pressing Enter")))),
+    HasInsertAndReplaceRange: ( new RawContextKey("suggestionHasInsertAndReplaceRange", false, ( localize(1607, "Whether the current suggestion has insert and replace behaviour")))),
     InsertMode: ( new RawContextKey("suggestionInsertMode", undefined, {
         type: "string",
-        description: ( localize(1607, "Whether the default behaviour is to insert or replace"))
+        description: ( localize(1608, "Whether the default behaviour is to insert or replace"))
     })),
-    CanResolve: ( new RawContextKey("suggestionCanResolve", false, ( localize(1608, "Whether the current suggestion supports to resolve further details"))))
+    CanResolve: ( new RawContextKey("suggestionCanResolve", false, ( localize(1609, "Whether the current suggestion supports to resolve further details"))))
 };
 const suggestWidgetStatusbarMenu = ( new MenuId("suggestWidgetStatusBar"));
 class CompletionItem {

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

@@ -493,7 +493,7 @@ let SuggestController = class SuggestController {
     _alertCompletionItem(item) {
         if (isNonEmptyArray(item.completion.additionalTextEdits)) {
             const msg = ( localize(
-                1609,
+                1610,
                 "Accepting '{0}' made {1} additional edits",
                 item.textLabel,
                 item.completion.additionalTextEdits.length
@@ -684,7 +684,7 @@ class TriggerSuggestAction extends EditorAction {
     constructor() {
         super({
             id: TriggerSuggestAction.id,
-            label: ( localize2(1610, "Trigger Suggest")),
+            label: ( localize2(1611, "Trigger Suggest")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 EditorContextKeys.hasCompletionItemProvider,
@@ -746,13 +746,13 @@ registerEditorCommand(( new SuggestCommand({
     }],
     menuOpts: [{
         menuId: suggestWidgetStatusbarMenu,
-        title: ( localize(1611, "Insert")),
+        title: ( localize(1612, "Insert")),
         group: "left",
         order: 1,
         when: ( ContextKeyExpr.and(Context.HasFocusedSuggestion, ( Context.HasInsertAndReplaceRange.toNegated())))
     }, {
         menuId: suggestWidgetStatusbarMenu,
-        title: ( localize(1611, "Insert")),
+        title: ( localize(1612, "Insert")),
         group: "left",
         order: 1,
         when: ( ContextKeyExpr.and(
@@ -762,7 +762,7 @@ registerEditorCommand(( new SuggestCommand({
         ))
     }, {
         menuId: suggestWidgetStatusbarMenu,
-        title: ( localize(1612, "Replace")),
+        title: ( localize(1613, "Replace")),
         group: "left",
         order: 1,
         when: ( ContextKeyExpr.and(
@@ -797,7 +797,7 @@ registerEditorCommand(( new SuggestCommand({
             Context.HasInsertAndReplaceRange,
             ( Context.InsertMode.isEqualTo("insert"))
         )),
-        title: ( localize(1612, "Replace"))
+        title: ( localize(1613, "Replace"))
     }, {
         menuId: suggestWidgetStatusbarMenu,
         group: "left",
@@ -807,7 +807,7 @@ registerEditorCommand(( new SuggestCommand({
             Context.HasInsertAndReplaceRange,
             ( Context.InsertMode.isEqualTo("replace"))
         )),
-        title: ( localize(1611, "Insert"))
+        title: ( localize(1612, "Insert"))
     }]
 })));
 CommandsRegistry.registerCommandAlias("acceptSelectedSuggestionOnEnter", "acceptSelectedSuggestion");
@@ -841,7 +841,7 @@ registerEditorCommand(( new SuggestCommand({
         group: "left",
         order: 0,
         when: ( Context.HasFocusedSuggestion.toNegated()),
-        title: ( localize(1613, "Select"))
+        title: ( localize(1614, "Select"))
     }
 })));
 registerEditorCommand(( new SuggestCommand({
@@ -933,13 +933,13 @@ registerEditorCommand(( new SuggestCommand({
         group: "right",
         order: 1,
         when: ( ContextKeyExpr.and(Context.DetailsVisible, Context.CanResolve)),
-        title: ( localize(1614, "Show Less"))
+        title: ( localize(1615, "Show Less"))
     }, {
         menuId: suggestWidgetStatusbarMenu,
         group: "right",
         order: 1,
         when: ( ContextKeyExpr.and(( Context.DetailsVisible.toNegated()), Context.CanResolve)),
-        title: ( localize(1615, "Show More"))
+        title: ( localize(1616, "Show More"))
     }]
 })));
 registerEditorCommand(( new SuggestCommand({
@@ -1024,7 +1024,7 @@ registerEditorAction(class extends EditorAction {
     constructor() {
         super({
             id: "editor.action.resetSuggestSize",
-            label: ( localize2(1616, "Reset Suggest Widget Size")),
+            label: ( localize2(1617, "Reset Suggest Widget Size")),
             precondition: undefined
         });
     }

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

@@ -44,38 +44,38 @@ import { isWindows } from '../../../../base/common/platform.js';
 
 var SuggestWidget_1;
 registerCss(suggest);
-registerColor("editorSuggestWidget.background", editorWidgetBackground, ( localize(1617, "Background color of the suggest widget.")));
-registerColor("editorSuggestWidget.border", editorWidgetBorder, ( localize(1618, "Border color of the suggest widget.")));
-const editorSuggestWidgetForeground = registerColor("editorSuggestWidget.foreground", editorForeground, ( localize(1619, "Foreground color of the suggest widget.")));
+registerColor("editorSuggestWidget.background", editorWidgetBackground, ( localize(1618, "Background color of the suggest widget.")));
+registerColor("editorSuggestWidget.border", editorWidgetBorder, ( localize(1619, "Border color of the suggest widget.")));
+const editorSuggestWidgetForeground = registerColor("editorSuggestWidget.foreground", editorForeground, ( localize(1620, "Foreground color of the suggest widget.")));
 registerColor(
     "editorSuggestWidget.selectedForeground",
     quickInputListFocusForeground,
-    ( localize(1620, "Foreground color of the selected entry in the suggest widget."))
+    ( localize(1621, "Foreground color of the selected entry in the suggest widget."))
 );
 registerColor(
     "editorSuggestWidget.selectedIconForeground",
     quickInputListFocusIconForeground,
-    ( localize(1621, "Icon foreground color of the selected entry in the suggest widget."))
+    ( localize(1622, "Icon foreground color of the selected entry in the suggest widget."))
 );
 const editorSuggestWidgetSelectedBackground = registerColor(
     "editorSuggestWidget.selectedBackground",
     quickInputListFocusBackground,
-    ( localize(1622, "Background color of the selected entry in the suggest widget."))
+    ( localize(1623, "Background color of the selected entry in the suggest widget."))
 );
 registerColor(
     "editorSuggestWidget.highlightForeground",
     listHighlightForeground,
-    ( localize(1623, "Color of the match highlights in the suggest widget."))
+    ( localize(1624, "Color of the match highlights in the suggest widget."))
 );
 registerColor(
     "editorSuggestWidget.focusHighlightForeground",
     listFocusHighlightForeground,
     ( localize(
-    1624,
+    1625,
     "Color of the match highlights in the suggest widget when an item is focused."
 ))
 );
-registerColor("editorSuggestWidgetStatus.foreground", ( transparent(editorSuggestWidgetForeground, .5)), ( localize(1625, "Foreground color of the suggest widget status.")));
+registerColor("editorSuggestWidgetStatus.foreground", ( transparent(editorSuggestWidgetForeground, .5)), ( localize(1626, "Foreground color of the suggest widget status.")));
 var State;
 (function(State) {
     State[State["Hidden"] = 0] = "Hidden";
@@ -118,10 +118,10 @@ let SuggestWidget = class SuggestWidget {
         SuggestWidget_1 = this;
     }
     static {
-        this.LOADING_MESSAGE = ( localize(1626, "Loading..."));
+        this.LOADING_MESSAGE = ( localize(1627, "Loading..."));
     }
     static {
-        this.NO_SUGGESTIONS_MESSAGE = ( localize(1627, "No suggestions."));
+        this.NO_SUGGESTIONS_MESSAGE = ( localize(1628, "No suggestions."));
     }
     constructor(
         editor,
@@ -218,7 +218,7 @@ let SuggestWidget = class SuggestWidget {
             multipleSelectionSupport: false,
             accessibilityProvider: {
                 getRole: () => isWindows ? "listitem" : "option",
-                getWidgetAriaLabel: () => ( localize(1628, "Suggest")),
+                getWidgetAriaLabel: () => ( localize(1629, "Suggest")),
                 getWidgetRole: () => "listbox",
                 getAriaLabel: item => {
                     let label = item.textLabel;
@@ -229,14 +229,14 @@ let SuggestWidget = class SuggestWidget {
                             description
                         } = item.completion.label;
                         if (detail && description) {
-                            label = ( localize(1629, "{0} {1}, {2}, {3}", label, detail, description, kindLabel));
+                            label = ( localize(1630, "{0} {1}, {2}, {3}", label, detail, description, kindLabel));
                         } else if (detail) {
-                            label = ( localize(1630, "{0} {1}, {2}", label, detail, kindLabel));
+                            label = ( localize(1631, "{0} {1}, {2}", label, detail, kindLabel));
                         } else if (description) {
-                            label = ( localize(1631, "{0}, {1}, {2}", label, description, kindLabel));
+                            label = ( localize(1632, "{0}, {1}, {2}", label, description, kindLabel));
                         }
                     } else {
-                        label = ( localize(1632, "{0}, {1}", label, kindLabel));
+                        label = ( localize(1633, "{0}, {1}", label, kindLabel));
                     }
                     if (!item.isResolved || !this._isDetailsVisible()) {
                         return label;
@@ -250,7 +250,7 @@ let SuggestWidget = class SuggestWidget {
                         detail || "",
                         documentation ? (typeof documentation === "string" ? documentation : documentation.value) : ""
                     );
-                    return localize(1633, "{0}, docs: {1}", label, docs);
+                    return localize(1634, "{0}, docs: {1}", label, docs);
                 }
             }
         }));

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

@@ -41,7 +41,7 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
         this._disposables.add(this._scrollbar);
         this._header = append(this._body, $(".header"));
         this._close = append(this._header, $("span" + ThemeIcon.asCSSSelector(Codicon.close)));
-        this._close.title = ( localize(1634, "Close"));
+        this._close.title = ( localize(1635, "Close"));
         this._close.role = "button";
         this._close.tabIndex = -1;
         this._type = append(this._header, $("p.type"));
@@ -89,7 +89,7 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
         };
     }
     renderLoading() {
-        this._type.textContent = ( localize(1635, "Loading..."));
+        this._type.textContent = ( localize(1636, "Loading..."));
         this._docs.textContent = "";
         this.domNode.classList.remove("no-docs", "no-type");
         this.layout(this.size.width, this.getLayoutInfo().lineHeight * 2);

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

@@ -19,7 +19,7 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { canExpandCompletionItem } from './suggestWidgetDetails.js';
 
-const suggestMoreInfoIcon = registerIcon("suggest-more-info", Codicon.chevronRight, ( localize(1636, "Icon for more information in the suggest widget.")));
+const suggestMoreInfoIcon = registerIcon("suggest-more-info", Codicon.chevronRight, ( localize(1637, "Icon for more information in the suggest widget.")));
 const _completionItemColor = new (class ColorExtractor {
     static {
         this._regexRelaxed = /(#([\da-fA-F]{3}){1,2}|(rgb|hsl)a\(\s*(\d{1,3}%?\s*,\s*){3}(1|0?\.\d+)\)|(rgb|hsl)\(\s*\d{1,3}%?(\s*,\s*\d{1,3}%?){2}\s*\))/;
@@ -80,7 +80,7 @@ let ItemRenderer = class ItemRenderer {
         const qualifierLabel = append(left, $("span.qualifier-label"));
         const detailsLabel = append(right, $("span.details-label"));
         const readMore = append(right, $("span.readMore" + ThemeIcon.asCSSSelector(suggestMoreInfoIcon)));
-        readMore.title = ( localize(1637, "Read More"));
+        readMore.title = ( localize(1638, "Read More"));
         const configureFont = () => {
             const options = this._editor.getOptions();
             const fontInfo = options.get(EditorOption.fontInfo);

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

@@ -14,7 +14,7 @@ let WordContextKey = class WordContextKey {
         this.AtEnd = ( new RawContextKey("atEndOfWord", false, {
             type: "boolean",
             description: ( localize(
-                1638,
+                1639,
                 "A context key that is true when at the end of a word. Note that this is only defined when tab-completions are enabled"
             ))
         }));