@codingame/monaco-vscode-api 28.4.1 → 29.0.0

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(1509, "No result."))), token);
+            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localize(1514, "No result."))), token);
         } else if (result.rejectReason) {
             return this._provideRenameEdits(newName, i + 1, rejects.concat(result.rejectReason), token);
         }
@@ -200,7 +200,7 @@ let RenameController = class RenameController {
                     e instanceof Error ? e : JSON.stringify(e, null, "\t")
                 );
                 if (typeof e === "string" || isMarkdownString(e)) {
-                    MessageController.get(this.editor)?.showMessage(e || ( localize(1510, "An unknown error occurred while resolving rename location")), position);
+                    MessageController.get(this.editor)?.showMessage(e || ( localize(1515, "An unknown error occurred while resolving rename location")), position);
                 }
             }
             return undefined;
@@ -283,16 +283,16 @@ let RenameController = class RenameController {
             this._bulkEditService.apply(renameResult, {
                 editor: this.editor,
                 showPreview: inputFieldResult.wantsPreview,
-                label: ( localize(1511, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
+                label: ( localize(1516, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
                 code: "undoredo.rename",
-                quotableLabel: ( localize(1512, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
+                quotableLabel: ( localize(1517, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
                 respectAutoSaveConfig: true,
                 reason: EditSources.rename(loc?.text, inputFieldResult.newName)
             }).then(result => {
                 trace("edits applied");
                 if (result.ariaSummary) {
                     alert(( localize(
-                        1513,
+                        1518,
                         "Successfully renamed '{0}' to '{1}'. Summary: {2}",
                         loc.text,
                         inputFieldResult.newName,
@@ -301,12 +301,12 @@ let RenameController = class RenameController {
                 }
             }).catch(err => {
                 trace(`error when applying edits ${JSON.stringify(err, null, "\t")}`);
-                this._notificationService.error(( localize(1514, "Rename failed to apply edits")));
+                this._notificationService.error(( localize(1519, "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(1515, "Rename failed to compute edits")));
+            this._notificationService.error(( localize(1520, "Rename failed to compute edits")));
             this._logService.error(err);
         }).finally(() => {
             cts2.dispose();
@@ -333,7 +333,7 @@ class RenameAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.rename",
-            label: ( localize2(1516, "Rename Symbol")),
+            label: ( localize2(1521, "Rename Symbol")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasRenameProvider)),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -420,7 +420,7 @@ registerAction2(class FocusNextRenameSuggestion extends Action2 {
         super({
             id: "focusNextRenameSuggestion",
             title: {
-                ...( localize2(1517, "Focus Next Rename Suggestion"))
+                ...( localize2(1522, "Focus Next Rename Suggestion"))
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [{
@@ -446,7 +446,7 @@ registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
         super({
             id: "focusPreviousRenameSuggestion",
             title: {
-                ...( localize2(1518, "Focus Previous Rename Suggestion"))
+                ...( localize2(1523, "Focus Previous Rename Suggestion"))
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [{
@@ -494,7 +494,7 @@ registerModelAndPositionCommand("_executePrepareRename", async function(accessor
     properties: {
         "editor.rename.enablePreview": {
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            description: ( localize(1519, "Enable/disable the ability to preview changes before renaming")),
+            description: ( localize(1524, "Enable/disable the ability to preview changes before renaming")),
             default: true,
             type: "boolean"
         }

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

@@ -45,7 +45,7 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.se
 import { HoverStyle } from '../../../../base/browser/ui/hover/hover.js';
 
 registerCss(renameWidget);
-const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey("renameInputVisible", false, ( localize(1520, "Whether the rename input widget is visible"))));
+const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey("renameInputVisible", false, ( localize(1525, "Whether the rename input widget is visible"))));
 let RenameWidget = class RenameWidget {
     constructor(
         _editor,
@@ -185,7 +185,7 @@ let RenameWidget = class RenameWidget {
     beforeRender() {
         const [accept, preview] = this._acceptKeybindings;
         this._label.innerText = ( localize(
-            1521,
+            1526,
             "{0} to Rename, {1} to Preview",
             this._keybindingService.lookupKeybinding(accept)?.getLabel(),
             this._keybindingService.lookupKeybinding(preview)?.getLabel()
@@ -512,7 +512,7 @@ class RenameCandidateListView {
         this._listWidget.layout(height, width);
         this._listContainer.style.height = `${height}px`;
         this._listContainer.style.width = `${width}px`;
-        status(( localize(1522, "Received {0} rename suggestions", candidates.length)));
+        status(( localize(1527, "Received {0} rename suggestions", candidates.length)));
     }
     clearCandidates() {
         this._listContainer.style.height = "0px";
@@ -655,13 +655,13 @@ class InputWithButton {
             this._inputNode.className = "rename-input";
             this._inputNode.type = "text";
             this._inputNode.style.border = "none";
-            this._inputNode.setAttribute("aria-label", ( localize(1523, "Rename input. Type new name and press Enter to commit.")));
+            this._inputNode.setAttribute("aria-label", ( localize(1528, "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(1524, "Generate New Name Suggestions"));
-            this._buttonCancelHoverText = ( localize(1525, "Cancel"));
+            this._buttonGenHoverText = ( localize(1529, "Generate New Name Suggestions"));
+            this._buttonCancelHoverText = ( localize(1530, "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

@@ -126,7 +126,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(true, {
             id: "editor.action.smartSelect.expand",
-            label: ( localize2(1526, "Expand Selection")),
+            label: ( localize2(1531, "Expand Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -140,7 +140,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: "1_basic",
-                title: ( localize(1527, "&&Expand Selection")),
+                title: ( localize(1532, "&&Expand Selection")),
                 order: 2
             }
         });
@@ -151,7 +151,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(false, {
             id: "editor.action.smartSelect.shrink",
-            label: ( localize2(1528, "Shrink Selection")),
+            label: ( localize2(1533, "Shrink Selection")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -165,7 +165,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
                 group: "1_basic",
-                title: ( localize(1529, "&&Shrink Selection")),
+                title: ( localize(1534, "&&Shrink Selection")),
                 order: 3
             }
         });

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

@@ -40,13 +40,13 @@ let SnippetController2 = class SnippetController2 {
         return editor.getContribution(SnippetController2_1.ID);
     }
     static {
-        this.InSnippetMode = ( new RawContextKey("inSnippetMode", false, ( localize(1530, "Whether the editor in current in snippet mode"))));
+        this.InSnippetMode = ( new RawContextKey("inSnippetMode", false, ( localize(1535, "Whether the editor in current in snippet mode"))));
     }
     static {
-        this.HasNextTabstop = ( new RawContextKey("hasNextTabstop", false, ( localize(1531, "Whether there is a next tab stop when in snippet mode"))));
+        this.HasNextTabstop = ( new RawContextKey("hasNextTabstop", false, ( localize(1536, "Whether there is a next tab stop when in snippet mode"))));
     }
     static {
-        this.HasPrevTabstop = ( new RawContextKey("hasPrevTabstop", false, ( localize(1532, "Whether there is a previous tab stop when in snippet mode"))));
+        this.HasPrevTabstop = ( new RawContextKey("hasPrevTabstop", false, ( localize(1537, "Whether there is a previous tab stop when in snippet mode"))));
     }
     constructor(
         _editor,
@@ -157,7 +157,7 @@ let SnippetController2 = class SnippetController2 {
                             filterText: isAnyOfOptions ? `${word}_${option.value}` : undefined,
                             command: {
                                 id: "jumpToNextSnippetPlaceholder",
-                                title: ( localize(1533, "Go to next placeholder..."))
+                                title: ( localize(1538, "Go to next placeholder..."))
                             }
                         });
                     }

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

@@ -221,16 +221,16 @@ class TimeBasedVariableResolver {
         this._date = ( new Date());
     }
     static {
-        this.dayNames = [( localize(1534, "Sunday")), ( localize(1535, "Monday")), ( localize(1536, "Tuesday")), ( localize(1537, "Wednesday")), ( localize(1538, "Thursday")), ( localize(1539, "Friday")), ( localize(1540, "Saturday"))];
+        this.dayNames = [( localize(1539, "Sunday")), ( localize(1540, "Monday")), ( localize(1541, "Tuesday")), ( localize(1542, "Wednesday")), ( localize(1543, "Thursday")), ( localize(1544, "Friday")), ( localize(1545, "Saturday"))];
     }
     static {
-        this.dayNamesShort = [( localize(1541, "Sun")), ( localize(1542, "Mon")), ( localize(1543, "Tue")), ( localize(1544, "Wed")), ( localize(1545, "Thu")), ( localize(1546, "Fri")), ( localize(1547, "Sat"))];
+        this.dayNamesShort = [( localize(1546, "Sun")), ( localize(1547, "Mon")), ( localize(1548, "Tue")), ( localize(1549, "Wed")), ( localize(1550, "Thu")), ( localize(1551, "Fri")), ( localize(1552, "Sat"))];
     }
     static {
-        this.monthNames = [( localize(1548, "January")), ( localize(1549, "February")), ( localize(1550, "March")), ( localize(1551, "April")), ( localize(1552, "May")), ( localize(1553, "June")), ( localize(1554, "July")), ( localize(1555, "August")), ( localize(1556, "September")), ( localize(1557, "October")), ( localize(1558, "November")), ( localize(1559, "December"))];
+        this.monthNames = [( localize(1553, "January")), ( localize(1554, "February")), ( localize(1555, "March")), ( localize(1556, "April")), ( localize(1557, "May")), ( localize(1558, "June")), ( localize(1559, "July")), ( localize(1560, "August")), ( localize(1561, "September")), ( localize(1562, "October")), ( localize(1563, "November")), ( localize(1564, "December"))];
     }
     static {
-        this.monthNamesShort = [( localize(1560, "Jan")), ( localize(1561, "Feb")), ( localize(1562, "Mar")), ( localize(1563, "Apr")), ( localize(1564, "May")), ( localize(1565, "Jun")), ( localize(1566, "Jul")), ( localize(1567, "Aug")), ( localize(1568, "Sep")), ( localize(1569, "Oct")), ( localize(1570, "Nov")), ( localize(1571, "Dec"))];
+        this.monthNamesShort = [( localize(1565, "Jan")), ( localize(1566, "Feb")), ( localize(1567, "Mar")), ( localize(1568, "Apr")), ( localize(1569, "May")), ( localize(1570, "Jun")), ( localize(1571, "Jul")), ( localize(1572, "Aug")), ( localize(1573, "Sep")), ( localize(1574, "Oct")), ( localize(1575, "Nov")), ( localize(1576, "Dec"))];
     }
     resolve(variable) {
         const {

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css

@@ -7,7 +7,7 @@
 	overflow: hidden;
 	border-bottom: 1px solid var(--vscode-editorStickyScroll-border);
 	width: 100%;
-	box-shadow: var(--vscode-shadow-md);
+	box-shadow: var(--vscode-editorStickyScroll-shadow) 0 4px 2px -2px;
 	z-index: 4;
 	right: initial !important;
 	margin-left: '0px';

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(1572, "Toggle Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1573, "&&Toggle Editor Sticky Scroll"))
+                ...( localize2(1577, "Toggle Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1578, "&&Toggle Editor Sticky Scroll"))
             },
             metadata: {
                 description: ( localize2(
-                    1574,
+                    1579,
                     "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(1575, "Sticky Scroll")),
-                mnemonicTitle: ( localize(1576, "&&Sticky Scroll"))
+                title: ( localize(1580, "Sticky Scroll")),
+                mnemonicTitle: ( localize(1581, "&&Sticky Scroll"))
             },
             menu: [{
                 id: MenuId.CommandPalette
@@ -57,8 +57,8 @@ class FocusStickyScroll extends EditorAction2 {
         super({
             id: "editor.action.focusStickyScroll",
             title: {
-                ...( localize2(1577, "Focus Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1578, "&&Focus Editor Sticky Scroll"))
+                ...( localize2(1582, "Focus Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1583, "&&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(1579, "Select the next editor sticky scroll line")),
+            title: ( localize2(1584, "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(1580, "Select the previous sticky scroll line")),
+            title: ( localize2(1585, "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(1581, "Go to the focused sticky scroll line")),
+            title: ( localize2(1586, "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(1582, "Select Editor")),
+            title: ( localize2(1587, "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(1583, "Whether any suggestion is focused")))),
-    DetailsVisible: ( new RawContextKey("suggestWidgetDetailsVisible", false, ( localize(1584, "Whether suggestion details are visible")))),
-    DetailsFocused: ( new RawContextKey("suggestWidgetDetailsFocused", false, ( localize(1585, "Whether the details pane of the suggest widget has focus")))),
-    MultipleSuggestions: ( new RawContextKey("suggestWidgetMultipleSuggestions", false, ( localize(1586, "Whether there are multiple suggestions to pick from")))),
+    HasFocusedSuggestion: ( new RawContextKey("suggestWidgetHasFocusedSuggestion", false, ( localize(1588, "Whether any suggestion is focused")))),
+    DetailsVisible: ( new RawContextKey("suggestWidgetDetailsVisible", false, ( localize(1589, "Whether suggestion details are visible")))),
+    DetailsFocused: ( new RawContextKey("suggestWidgetDetailsFocused", false, ( localize(1590, "Whether the details pane of the suggest widget has focus")))),
+    MultipleSuggestions: ( new RawContextKey("suggestWidgetMultipleSuggestions", false, ( localize(1591, "Whether there are multiple suggestions to pick from")))),
     MakesTextEdit: ( new RawContextKey("suggestionMakesTextEdit", true, ( localize(
-        1587,
+        1592,
         "Whether inserting the current suggestion yields in a change or has everything already been typed"
     )))),
-    AcceptSuggestionsOnEnter: ( new RawContextKey("acceptSuggestionOnEnter", true, ( localize(1588, "Whether suggestions are inserted when pressing Enter")))),
-    HasInsertAndReplaceRange: ( new RawContextKey("suggestionHasInsertAndReplaceRange", false, ( localize(1589, "Whether the current suggestion has insert and replace behaviour")))),
+    AcceptSuggestionsOnEnter: ( new RawContextKey("acceptSuggestionOnEnter", true, ( localize(1593, "Whether suggestions are inserted when pressing Enter")))),
+    HasInsertAndReplaceRange: ( new RawContextKey("suggestionHasInsertAndReplaceRange", false, ( localize(1594, "Whether the current suggestion has insert and replace behaviour")))),
     InsertMode: ( new RawContextKey("suggestionInsertMode", undefined, {
         type: "string",
-        description: ( localize(1590, "Whether the default behaviour is to insert or replace"))
+        description: ( localize(1595, "Whether the default behaviour is to insert or replace"))
     })),
-    CanResolve: ( new RawContextKey("suggestionCanResolve", false, ( localize(1591, "Whether the current suggestion supports to resolve further details"))))
+    CanResolve: ( new RawContextKey("suggestionCanResolve", false, ( localize(1596, "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(
-                1592,
+                1597,
                 "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(1593, "Trigger Suggest")),
+            label: ( localize2(1598, "Trigger Suggest")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 EditorContextKeys.hasCompletionItemProvider,
@@ -746,13 +746,13 @@ registerEditorCommand(( new SuggestCommand({
     }],
     menuOpts: [{
         menuId: suggestWidgetStatusbarMenu,
-        title: ( localize(1594, "Insert")),
+        title: ( localize(1599, "Insert")),
         group: "left",
         order: 1,
         when: ( ContextKeyExpr.and(Context.HasFocusedSuggestion, ( Context.HasInsertAndReplaceRange.toNegated())))
     }, {
         menuId: suggestWidgetStatusbarMenu,
-        title: ( localize(1594, "Insert")),
+        title: ( localize(1599, "Insert")),
         group: "left",
         order: 1,
         when: ( ContextKeyExpr.and(
@@ -762,7 +762,7 @@ registerEditorCommand(( new SuggestCommand({
         ))
     }, {
         menuId: suggestWidgetStatusbarMenu,
-        title: ( localize(1595, "Replace")),
+        title: ( localize(1600, "Replace")),
         group: "left",
         order: 1,
         when: ( ContextKeyExpr.and(
@@ -797,7 +797,7 @@ registerEditorCommand(( new SuggestCommand({
             Context.HasInsertAndReplaceRange,
             ( Context.InsertMode.isEqualTo("insert"))
         )),
-        title: ( localize(1595, "Replace"))
+        title: ( localize(1600, "Replace"))
     }, {
         menuId: suggestWidgetStatusbarMenu,
         group: "left",
@@ -807,7 +807,7 @@ registerEditorCommand(( new SuggestCommand({
             Context.HasInsertAndReplaceRange,
             ( Context.InsertMode.isEqualTo("replace"))
         )),
-        title: ( localize(1594, "Insert"))
+        title: ( localize(1599, "Insert"))
     }]
 })));
 CommandsRegistry.registerCommandAlias("acceptSelectedSuggestionOnEnter", "acceptSelectedSuggestion");
@@ -841,7 +841,7 @@ registerEditorCommand(( new SuggestCommand({
         group: "left",
         order: 0,
         when: ( Context.HasFocusedSuggestion.toNegated()),
-        title: ( localize(1596, "Select"))
+        title: ( localize(1601, "Select"))
     }
 })));
 registerEditorCommand(( new SuggestCommand({
@@ -933,13 +933,13 @@ registerEditorCommand(( new SuggestCommand({
         group: "right",
         order: 1,
         when: ( ContextKeyExpr.and(Context.DetailsVisible, Context.CanResolve)),
-        title: ( localize(1597, "Show Less"))
+        title: ( localize(1602, "Show Less"))
     }, {
         menuId: suggestWidgetStatusbarMenu,
         group: "right",
         order: 1,
         when: ( ContextKeyExpr.and(( Context.DetailsVisible.toNegated()), Context.CanResolve)),
-        title: ( localize(1598, "Show More"))
+        title: ( localize(1603, "Show More"))
     }]
 })));
 registerEditorCommand(( new SuggestCommand({
@@ -1024,7 +1024,7 @@ registerEditorAction(class extends EditorAction {
     constructor() {
         super({
             id: "editor.action.resetSuggestSize",
-            label: ( localize2(1599, "Reset Suggest Widget Size")),
+            label: ( localize2(1604, "Reset Suggest Widget Size")),
             precondition: undefined
         });
     }

package/vscode/src/vs/editor/contrib/suggest/browser/suggestModel.d.ts

@@ -65,6 +65,7 @@ export declare class SuggestModel implements IDisposable {
     private readonly _toDispose;
     private readonly _triggerCharacterListener;
     private readonly _triggerQuickSuggest;
+    private _waitForInlineCompletions;
     private _triggerState;
     private _requestToken?;
     private _context?;
@@ -87,6 +88,7 @@ export declare class SuggestModel implements IDisposable {
     private _onCursorChange;
     private _onCompositionEnd;
     private _doTriggerQuickSuggest;
+    private _waitForInlineCompletionsAndTrigger;
     private _refilterCompletionItems;
     trigger(options: SuggestTriggerOptions): void;
     /**

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { TimeoutTimer } from '../../../../base/common/async.js';
+import { TimeoutTimer, disposableTimeout } from '../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { Emitter } from '../../../../base/common/event.js';
@@ -23,8 +23,11 @@ import { ILanguageFeaturesService } from '../../../common/services/languageFeatu
 import { FuzzyScoreOptions } from '../../../../base/common/filters.js';
 import { assertType } from '../../../../base/common/types.js';
 import { InlineCompletionContextKeys } from '../../inlineCompletions/browser/controller/inlineCompletionContextKeys.js';
+import { getInlineCompletionsController } from '../../inlineCompletions/browser/controller/common.js';
 import { SnippetController2 } from '../../snippet/browser/snippetController2.js';
 import { IEnvironmentService } from '../../../../platform/environment/common/environment.service.js';
+import '../../../../base/common/observableInternal/index.js';
+import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
 
 var SuggestModel_1;
 class LineContext {
@@ -159,6 +162,7 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
             this._onDidTrigger,
             this._triggerQuickSuggest
         ]);
+        this._waitForInlineCompletions?.dispose();
         this._toDispose.dispose();
         this._completionDisposables.dispose();
         this.cancel();
@@ -239,8 +243,10 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
         }
     }
     cancel(retrigger = false) {
+        this._triggerQuickSuggest.cancel();
+        this._waitForInlineCompletions?.dispose();
+        this._waitForInlineCompletions = undefined;
         if (this._triggerState !== undefined) {
-            this._triggerQuickSuggest.cancel();
             this._requestToken?.cancel();
             this._requestToken = undefined;
             this._triggerState = undefined;
@@ -299,6 +305,8 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
             return;
         }
         this.cancel();
+        this._waitForInlineCompletions?.dispose();
+        this._waitForInlineCompletions = undefined;
         this._triggerQuickSuggest.cancelAndSet(() => {
             if (this._triggerState !== undefined) {
                 return;
@@ -315,14 +323,17 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
             if (QuickSuggestionsOptions.isAllOff(config)) {
                 return;
             }
+            let waitForInlineCompletions = false;
             if (!QuickSuggestionsOptions.isAllOn(config)) {
                 model.tokenization.tokenizeIfCheap(pos.lineNumber);
                 const lineTokens = model.tokenization.getLineTokens(pos.lineNumber);
                 const tokenType = lineTokens.getStandardTokenType(lineTokens.findTokenIndexAtOffset(Math.max(pos.column - 1 - 1, 0)));
-                if (QuickSuggestionsOptions.valueFor(config, tokenType) !== "on") {
-                    if (QuickSuggestionsOptions.valueFor(config, tokenType) !== "offWhenInlineCompletions" || (( this._languageFeaturesService.inlineCompletionsProvider.has(model)) && this._editor.getOption(EditorOption.inlineSuggest).enabled)) {
-                        return;
-                    }
+                const value = QuickSuggestionsOptions.valueFor(config, tokenType);
+                if (value === "off" || value === "inline") {
+                    return;
+                }
+                if (value === "offWhenInlineCompletions") {
+                    waitForInlineCompletions = ( this._languageFeaturesService.inlineCompletionsProvider.has(model)) && this._editor.getOption(EditorOption.inlineSuggest).enabled;
                 }
             }
             if (!canShowQuickSuggest(this._editor, this._contextKeyService)) {
@@ -331,10 +342,62 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
             if (!( this._languageFeaturesService.completionProvider.has(model))) {
                 return;
             }
+            if (waitForInlineCompletions) {
+                this._waitForInlineCompletionsAndTrigger(model, pos);
+            } else {
+                this.trigger({
+                    auto: true
+                });
+            }
+        }, this._editor.getOption(EditorOption.quickSuggestionsDelay));
+    }
+    _waitForInlineCompletionsAndTrigger(initialModel, initialPosition) {
+        const initialModelVersion = initialModel.getVersionId();
+        const inlineController = getInlineCompletionsController(this._editor);
+        const inlineModel = inlineController?.model.get();
+        if (!inlineModel) {
             this.trigger({
                 auto: true
             });
-        }, this._editor.getOption(EditorOption.quickSuggestionsDelay));
+            return;
+        }
+        const state = inlineModel.state.get();
+        if (state?.inlineSuggestion) {
+            return;
+        }
+        const store = ( new DisposableStore());
+        this._waitForInlineCompletions = store;
+        const triggerAndCleanUp = doTrigger => {
+            store.dispose();
+            if (this._waitForInlineCompletions === store) {
+                this._waitForInlineCompletions = undefined;
+            }
+            if (this._triggerState !== undefined) {
+                return;
+            }
+            if (!doTrigger) {
+                return;
+            }
+            const currentModel = this._editor.getModel();
+            const currentPosition = this._editor.getPosition();
+            if (currentModel === initialModel && currentModel.getVersionId() === initialModelVersion && currentPosition?.equals(initialPosition) && this._editor.hasWidgetFocus()) {
+                this.trigger({
+                    auto: true
+                });
+            }
+        };
+        disposableTimeout(() => {
+            triggerAndCleanUp(true);
+            inlineModel.stop("automatic");
+        }, 750, store);
+        store.add(autorun(reader => {
+            const status = inlineModel.status.read(reader);
+            const currentState = inlineModel.state.read(reader);
+            if (!currentState && status === "loading") {
+                return;
+            }
+            triggerAndCleanUp(!currentState);
+        }));
     }
     _refilterCompletionItems() {
         assertType(this._editor.hasModel());