@codingame/monaco-vscode-api 26.2.2 → 28.0.0

package/vscode/src/vs/editor/contrib/semanticTokens/browser/documentSemanticTokens.js

@@ -3,7 +3,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { isCancellationError, onUnexpectedError } from '../../../../base/common/errors.js';
-import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
 import { ResourceMap } from '../../../../base/common/map.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
@@ -29,6 +29,8 @@ let DocumentSemanticTokensFeature = class DocumentSemanticTokensFeature extends
     ) {
         super();
         this._watchers = ( new ResourceMap());
+        this._providerChangeListeners = this._register(( new DisposableStore()));
+        const provider = languageFeaturesService.documentSemanticTokensProvider;
         const register = model => {
             this._watchers.get(model.uri)?.dispose();
             this._watchers.set(model.uri, ( new ModelSemanticColoring(
@@ -57,6 +59,18 @@ let DocumentSemanticTokensFeature = class DocumentSemanticTokensFeature extends
                 }
             }
         };
+        const bindProviderChangeListeners = () => {
+            this._providerChangeListeners.clear();
+            for (const p of provider.allNoModel()) {
+                if (typeof p.onDidChange === "function") {
+                    this._providerChangeListeners.add(p.onDidChange(() => {
+                        for (const watcher of ( this._watchers.values())) {
+                            watcher.handleProviderDidChange(p);
+                        }
+                    }));
+                }
+            }
+        };
         modelService.getModels().forEach(model => {
             if (isSemanticColoringEnabled(model, themeService, configurationService)) {
                 register(model);
@@ -79,6 +93,13 @@ let DocumentSemanticTokensFeature = class DocumentSemanticTokensFeature extends
             }
         }));
         this._register(themeService.onDidColorThemeChange(handleSettingOrThemeChange));
+        bindProviderChangeListeners();
+        this._register(provider.onDidChange(() => {
+            bindProviderChangeListeners();
+            for (const watcher of ( this._watchers.values())) {
+                watcher.handleRegistryChange();
+            }
+        }));
     }
     dispose() {
         dispose(( this._watchers.values()));
@@ -106,6 +127,7 @@ let ModelSemanticColoring = class ModelSemanticColoring extends Disposable {
     ) {
         super();
         this._semanticTokensStylingService = _semanticTokensStylingService;
+        this._relevantProviders = ( new Set());
         this._isDisposed = false;
         this._model = model;
         this._provider = languageFeaturesService.documentSemanticTokensProvider;
@@ -119,8 +141,8 @@ let ModelSemanticColoring = class ModelSemanticColoring extends Disposable {
         )));
         this._currentDocumentResponse = null;
         this._currentDocumentRequestCancellationTokenSource = null;
-        this._documentProvidersChangeListeners = [];
         this._providersChangedDuringRequest = false;
+        this._updateRelevantProviders();
         this._register(this._model.onDidChangeContent(() => {
             if (!this._fetchDocumentSemanticTokens.isScheduled()) {
                 this._fetchDocumentSemanticTokens.schedule(this._debounceInformation.get(this._model));
@@ -141,34 +163,32 @@ let ModelSemanticColoring = class ModelSemanticColoring extends Disposable {
                 this._currentDocumentRequestCancellationTokenSource = null;
             }
             this._setDocumentSemanticTokens(null, null, null, []);
+            this._updateRelevantProviders();
             this._fetchDocumentSemanticTokens.schedule(0);
         }));
-        const bindDocumentChangeListeners = () => {
-            dispose(this._documentProvidersChangeListeners);
-            this._documentProvidersChangeListeners = [];
-            for (const provider of this._provider.all(model)) {
-                if (typeof provider.onDidChange === "function") {
-                    this._documentProvidersChangeListeners.push(provider.onDidChange(() => {
-                        if (this._currentDocumentRequestCancellationTokenSource) {
-                            this._providersChangedDuringRequest = true;
-                            return;
-                        }
-                        this._fetchDocumentSemanticTokens.schedule(0);
-                    }));
-                }
-            }
-        };
-        bindDocumentChangeListeners();
-        this._register(this._provider.onDidChange(() => {
-            bindDocumentChangeListeners();
-            this._fetchDocumentSemanticTokens.schedule(this._debounceInformation.get(this._model));
-        }));
         this._register(themeService.onDidColorThemeChange(_ => {
             this._setDocumentSemanticTokens(null, null, null, []);
             this._fetchDocumentSemanticTokens.schedule(this._debounceInformation.get(this._model));
         }));
         this._fetchDocumentSemanticTokens.schedule(0);
     }
+    handleRegistryChange() {
+        this._updateRelevantProviders();
+        this._fetchDocumentSemanticTokens.schedule(this._debounceInformation.get(this._model));
+    }
+    handleProviderDidChange(provider) {
+        if (!( this._relevantProviders.has(provider))) {
+            return;
+        }
+        if (this._currentDocumentRequestCancellationTokenSource) {
+            this._providersChangedDuringRequest = true;
+            return;
+        }
+        this._fetchDocumentSemanticTokens.schedule(0);
+    }
+    _updateRelevantProviders() {
+        this._relevantProviders = ( new Set(this._provider.all(this._model)));
+    }
     dispose() {
         if (this._currentDocumentResponse) {
             this._currentDocumentResponse.dispose();
@@ -178,8 +198,6 @@ let ModelSemanticColoring = class ModelSemanticColoring extends Disposable {
             this._currentDocumentRequestCancellationTokenSource.cancel();
             this._currentDocumentRequestCancellationTokenSource = null;
         }
-        dispose(this._documentProvidersChangeListeners);
-        this._documentProvidersChangeListeners = [];
         this._setDocumentSemanticTokens(null, null, null, []);
         this._isDisposed = true;
         super.dispose();

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(1500, "Expand Selection")),
+            label: ( localize2(1526, "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(1501, "&&Expand Selection")),
+                title: ( localize(1527, "&&Expand Selection")),
                 order: 2
             }
         });
@@ -151,7 +151,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(false, {
             id: "editor.action.smartSelect.shrink",
-            label: ( localize2(1502, "Shrink Selection")),
+            label: ( localize2(1528, "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(1503, "&&Shrink Selection")),
+                title: ( localize(1529, "&&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(1504, "Whether the editor in current in snippet mode"))));
+        this.InSnippetMode = ( new RawContextKey("inSnippetMode", false, ( localize(1530, "Whether the editor in current in snippet mode"))));
     }
     static {
-        this.HasNextTabstop = ( new RawContextKey("hasNextTabstop", false, ( localize(1505, "Whether there is a next tab stop when in snippet mode"))));
+        this.HasNextTabstop = ( new RawContextKey("hasNextTabstop", false, ( localize(1531, "Whether there is a next tab stop when in snippet mode"))));
     }
     static {
-        this.HasPrevTabstop = ( new RawContextKey("hasPrevTabstop", false, ( localize(1506, "Whether there is a previous tab stop when in snippet mode"))));
+        this.HasPrevTabstop = ( new RawContextKey("hasPrevTabstop", false, ( localize(1532, "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(1507, "Go to next placeholder..."))
+                                title: ( localize(1533, "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(1508, "Sunday")), ( localize(1509, "Monday")), ( localize(1510, "Tuesday")), ( localize(1511, "Wednesday")), ( localize(1512, "Thursday")), ( localize(1513, "Friday")), ( localize(1514, "Saturday"))];
+        this.dayNames = [( localize(1534, "Sunday")), ( localize(1535, "Monday")), ( localize(1536, "Tuesday")), ( localize(1537, "Wednesday")), ( localize(1538, "Thursday")), ( localize(1539, "Friday")), ( localize(1540, "Saturday"))];
     }
     static {
-        this.dayNamesShort = [( localize(1515, "Sun")), ( localize(1516, "Mon")), ( localize(1517, "Tue")), ( localize(1518, "Wed")), ( localize(1519, "Thu")), ( localize(1520, "Fri")), ( localize(1521, "Sat"))];
+        this.dayNamesShort = [( localize(1541, "Sun")), ( localize(1542, "Mon")), ( localize(1543, "Tue")), ( localize(1544, "Wed")), ( localize(1545, "Thu")), ( localize(1546, "Fri")), ( localize(1547, "Sat"))];
     }
     static {
-        this.monthNames = [( localize(1522, "January")), ( localize(1523, "February")), ( localize(1524, "March")), ( localize(1525, "April")), ( localize(1526, "May")), ( localize(1527, "June")), ( localize(1528, "July")), ( localize(1529, "August")), ( localize(1530, "September")), ( localize(1531, "October")), ( localize(1532, "November")), ( localize(1533, "December"))];
+        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"))];
     }
     static {
-        this.monthNamesShort = [( localize(1534, "Jan")), ( localize(1535, "Feb")), ( localize(1536, "Mar")), ( localize(1537, "Apr")), ( localize(1538, "May")), ( localize(1539, "Jun")), ( localize(1540, "Jul")), ( localize(1541, "Aug")), ( localize(1542, "Sep")), ( localize(1543, "Oct")), ( localize(1544, "Nov")), ( localize(1545, "Dec"))];
+        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"))];
     }
     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-editorStickyScroll-shadow) 0 4px 2px -2px;
+	box-shadow: var(--vscode-shadow-md);
 	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(1546, "Toggle Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1547, "&&Toggle Editor Sticky Scroll"))
+                ...( localize2(1572, "Toggle Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1573, "&&Toggle Editor Sticky Scroll"))
             },
             metadata: {
                 description: ( localize2(
-                    1548,
+                    1574,
                     "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(1549, "Sticky Scroll")),
-                mnemonicTitle: ( localize(1550, "&&Sticky Scroll"))
+                title: ( localize(1575, "Sticky Scroll")),
+                mnemonicTitle: ( localize(1576, "&&Sticky Scroll"))
             },
             menu: [{
                 id: MenuId.CommandPalette
@@ -57,8 +57,8 @@ class FocusStickyScroll extends EditorAction2 {
         super({
             id: "editor.action.focusStickyScroll",
             title: {
-                ...( localize2(1551, "Focus Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1552, "&&Focus Editor Sticky Scroll"))
+                ...( localize2(1577, "Focus Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1578, "&&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(1553, "Select the next editor sticky scroll line")),
+            title: ( localize2(1579, "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(1554, "Select the previous sticky scroll line")),
+            title: ( localize2(1580, "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(1555, "Go to the focused sticky scroll line")),
+            title: ( localize2(1581, "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(1556, "Select Editor")),
+            title: ( localize2(1582, "Select Editor")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.d.ts

@@ -54,6 +54,7 @@ export declare class StickyScrollController extends Disposable implements IEdito
     private _minRebuildFromLine;
     private _mouseTarget;
     private _cursorPositionListener;
+    private _positionLineNumber;
     private readonly _onDidChangeStickyScrollHeight;
     readonly onDidChangeStickyScrollHeight: Event<{
         height: number;

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

@@ -436,7 +436,11 @@ let StickyScrollController = class StickyScrollController extends Disposable {
         const lineNumberOption = this._editor.getOption(EditorOption.lineNumbers);
         if (lineNumberOption.renderType === RenderLineNumbersType.Relative) {
             if (!this._cursorPositionListener) {
-                this._cursorPositionListener = this._editor.onDidChangeCursorPosition(() => {
+                this._cursorPositionListener = this._editor.onDidChangeCursorPosition(e => {
+                    if (this._positionLineNumber === e.position.lineNumber) {
+                        return;
+                    }
+                    this._positionLineNumber = e.position.lineNumber;
                     this._showEndForLine = undefined;
                     this._renderStickyScroll(0);
                 });

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

@@ -472,11 +472,11 @@ class RenderedStickyLine {
         innerLineNumberHTML.style.width = `${layoutInfo.lineNumbersWidth}px`;
         innerLineNumberHTML.style.paddingLeft = `${layoutInfo.lineNumbersLeft}px`;
         lineNumberHTMLNode.appendChild(innerLineNumberHTML);
-        const foldingIcon = this._renderFoldingIconForLine(editor, foldingModel, lineNumber, lineHeight, isOnGlyphMargin);
-        if (foldingIcon) {
-            lineNumberHTMLNode.appendChild(foldingIcon.domNode);
-            foldingIcon.domNode.style.left = `${layoutInfo.lineNumbersWidth + layoutInfo.lineNumbersLeft}px`;
-            foldingIcon.domNode.style.lineHeight = `${lineHeight}px`;
+        this.foldingIcon = this._renderFoldingIconForLine(editor, foldingModel, lineNumber, lineHeight, isOnGlyphMargin);
+        if (this.foldingIcon) {
+            lineNumberHTMLNode.appendChild(this.foldingIcon.domNode);
+            this.foldingIcon.domNode.style.left = `${layoutInfo.lineNumbersWidth + layoutInfo.lineNumbersLeft}px`;
+            this.foldingIcon.domNode.style.lineHeight = `${lineHeight}px`;
         }
         editor.applyFontInfo(lineHTMLNode);
         editor.applyFontInfo(lineNumberHTMLNode);

package/vscode/src/vs/editor/contrib/suggest/browser/media/suggest.css

@@ -10,7 +10,8 @@
 	z-index: 40;
 	display: flex;
 	flex-direction: column;
-	border-radius: 3px;
+	border-radius: var(--vscode-cornerRadius-large);
+	box-shadow: var(--vscode-shadow-lg);
 }
 
 .monaco-editor .suggest-widget.message {
@@ -96,6 +97,7 @@
 .monaco-editor .suggest-widget .monaco-list {
 	user-select: none;
 	-webkit-user-select: none;
+	border-radius: var(--vscode-cornerRadius-large);
 }
 
 /** Styles for each row in the list element **/

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(1557, "Whether any suggestion is focused")))),
-    DetailsVisible: ( new RawContextKey("suggestWidgetDetailsVisible", false, ( localize(1558, "Whether suggestion details are visible")))),
-    DetailsFocused: ( new RawContextKey("suggestWidgetDetailsFocused", false, ( localize(1559, "Whether the details pane of the suggest widget has focus")))),
-    MultipleSuggestions: ( new RawContextKey("suggestWidgetMultipleSuggestions", false, ( localize(1560, "Whether there are multiple suggestions to pick from")))),
+    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")))),
     MakesTextEdit: ( new RawContextKey("suggestionMakesTextEdit", true, ( localize(
-        1561,
+        1587,
         "Whether inserting the current suggestion yields in a change or has everything already been typed"
     )))),
-    AcceptSuggestionsOnEnter: ( new RawContextKey("acceptSuggestionOnEnter", true, ( localize(1562, "Whether suggestions are inserted when pressing Enter")))),
-    HasInsertAndReplaceRange: ( new RawContextKey("suggestionHasInsertAndReplaceRange", false, ( localize(1563, "Whether the current suggestion has insert and replace behaviour")))),
+    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")))),
     InsertMode: ( new RawContextKey("suggestionInsertMode", undefined, {
         type: "string",
-        description: ( localize(1564, "Whether the default behaviour is to insert or replace"))
+        description: ( localize(1590, "Whether the default behaviour is to insert or replace"))
     })),
-    CanResolve: ( new RawContextKey("suggestionCanResolve", false, ( localize(1565, "Whether the current suggestion supports to resolve further details"))))
+    CanResolve: ( new RawContextKey("suggestionCanResolve", false, ( localize(1591, "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(
-                1566,
+                1592,
                 "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(1567, "Trigger Suggest")),
+            label: ( localize2(1593, "Trigger Suggest")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 EditorContextKeys.hasCompletionItemProvider,
@@ -746,13 +746,13 @@ registerEditorCommand(( new SuggestCommand({
     }],
     menuOpts: [{
         menuId: suggestWidgetStatusbarMenu,
-        title: ( localize(1568, "Insert")),
+        title: ( localize(1594, "Insert")),
         group: "left",
         order: 1,
         when: ( ContextKeyExpr.and(Context.HasFocusedSuggestion, ( Context.HasInsertAndReplaceRange.toNegated())))
     }, {
         menuId: suggestWidgetStatusbarMenu,
-        title: ( localize(1568, "Insert")),
+        title: ( localize(1594, "Insert")),
         group: "left",
         order: 1,
         when: ( ContextKeyExpr.and(
@@ -762,7 +762,7 @@ registerEditorCommand(( new SuggestCommand({
         ))
     }, {
         menuId: suggestWidgetStatusbarMenu,
-        title: ( localize(1569, "Replace")),
+        title: ( localize(1595, "Replace")),
         group: "left",
         order: 1,
         when: ( ContextKeyExpr.and(
@@ -797,7 +797,7 @@ registerEditorCommand(( new SuggestCommand({
             Context.HasInsertAndReplaceRange,
             ( Context.InsertMode.isEqualTo("insert"))
         )),
-        title: ( localize(1569, "Replace"))
+        title: ( localize(1595, "Replace"))
     }, {
         menuId: suggestWidgetStatusbarMenu,
         group: "left",
@@ -807,7 +807,7 @@ registerEditorCommand(( new SuggestCommand({
             Context.HasInsertAndReplaceRange,
             ( Context.InsertMode.isEqualTo("replace"))
         )),
-        title: ( localize(1568, "Insert"))
+        title: ( localize(1594, "Insert"))
     }]
 })));
 CommandsRegistry.registerCommandAlias("acceptSelectedSuggestionOnEnter", "acceptSelectedSuggestion");
@@ -841,7 +841,7 @@ registerEditorCommand(( new SuggestCommand({
         group: "left",
         order: 0,
         when: ( Context.HasFocusedSuggestion.toNegated()),
-        title: ( localize(1570, "Select"))
+        title: ( localize(1596, "Select"))
     }
 })));
 registerEditorCommand(( new SuggestCommand({
@@ -933,13 +933,13 @@ registerEditorCommand(( new SuggestCommand({
         group: "right",
         order: 1,
         when: ( ContextKeyExpr.and(Context.DetailsVisible, Context.CanResolve)),
-        title: ( localize(1571, "Show Less"))
+        title: ( localize(1597, "Show Less"))
     }, {
         menuId: suggestWidgetStatusbarMenu,
         group: "right",
         order: 1,
         when: ( ContextKeyExpr.and(( Context.DetailsVisible.toNegated()), Context.CanResolve)),
-        title: ( localize(1572, "Show More"))
+        title: ( localize(1598, "Show More"))
     }]
 })));
 registerEditorCommand(( new SuggestCommand({
@@ -1024,7 +1024,7 @@ registerEditorAction(class extends EditorAction {
     constructor() {
         super({
             id: "editor.action.resetSuggestSize",
-            label: ( localize2(1573, "Reset Suggest Widget Size")),
+            label: ( localize2(1599, "Reset Suggest Widget Size")),
             precondition: undefined
         });
     }

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

@@ -320,7 +320,9 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
                 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") {
-                    return;
+                    if (QuickSuggestionsOptions.valueFor(config, tokenType) !== "offWhenInlineCompletions" || (( this._languageFeaturesService.inlineCompletionsProvider.has(model)) && this._editor.getOption(EditorOption.inlineSuggest).enabled)) {
+                        return;
+                    }
                 }
             }
             if (!canShowQuickSuggest(this._editor, this._contextKeyService)) {

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(1574, "Background color of the suggest widget.")));
-registerColor("editorSuggestWidget.border", editorWidgetBorder, ( localize(1575, "Border color of the suggest widget.")));
-const editorSuggestWidgetForeground = registerColor("editorSuggestWidget.foreground", editorForeground, ( localize(1576, "Foreground color of the suggest widget.")));
+registerColor("editorSuggestWidget.background", editorWidgetBackground, ( localize(1600, "Background color of the suggest widget.")));
+registerColor("editorSuggestWidget.border", editorWidgetBorder, ( localize(1601, "Border color of the suggest widget.")));
+const editorSuggestWidgetForeground = registerColor("editorSuggestWidget.foreground", editorForeground, ( localize(1602, "Foreground color of the suggest widget.")));
 registerColor(
     "editorSuggestWidget.selectedForeground",
     quickInputListFocusForeground,
-    ( localize(1577, "Foreground color of the selected entry in the suggest widget."))
+    ( localize(1603, "Foreground color of the selected entry in the suggest widget."))
 );
 registerColor(
     "editorSuggestWidget.selectedIconForeground",
     quickInputListFocusIconForeground,
-    ( localize(1578, "Icon foreground color of the selected entry in the suggest widget."))
+    ( localize(1604, "Icon foreground color of the selected entry in the suggest widget."))
 );
 const editorSuggestWidgetSelectedBackground = registerColor(
     "editorSuggestWidget.selectedBackground",
     quickInputListFocusBackground,
-    ( localize(1579, "Background color of the selected entry in the suggest widget."))
+    ( localize(1605, "Background color of the selected entry in the suggest widget."))
 );
 registerColor(
     "editorSuggestWidget.highlightForeground",
     listHighlightForeground,
-    ( localize(1580, "Color of the match highlights in the suggest widget."))
+    ( localize(1606, "Color of the match highlights in the suggest widget."))
 );
 registerColor(
     "editorSuggestWidget.focusHighlightForeground",
     listFocusHighlightForeground,
     ( localize(
-    1581,
+    1607,
     "Color of the match highlights in the suggest widget when an item is focused."
 ))
 );
-registerColor("editorSuggestWidgetStatus.foreground", ( transparent(editorSuggestWidgetForeground, .5)), ( localize(1582, "Foreground color of the suggest widget status.")));
+registerColor("editorSuggestWidgetStatus.foreground", ( transparent(editorSuggestWidgetForeground, .5)), ( localize(1608, "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(1583, "Loading..."));
+        this.LOADING_MESSAGE = ( localize(1609, "Loading..."));
     }
     static {
-        this.NO_SUGGESTIONS_MESSAGE = ( localize(1584, "No suggestions."));
+        this.NO_SUGGESTIONS_MESSAGE = ( localize(1610, "No suggestions."));
     }
     constructor(
         editor,
@@ -218,7 +218,7 @@ let SuggestWidget = class SuggestWidget {
             multipleSelectionSupport: false,
             accessibilityProvider: {
                 getRole: () => isWindows ? "listitem" : "option",
-                getWidgetAriaLabel: () => ( localize(1585, "Suggest")),
+                getWidgetAriaLabel: () => ( localize(1611, "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(1586, "{0} {1}, {2}, {3}", label, detail, description, kindLabel));
+                            label = ( localize(1612, "{0} {1}, {2}, {3}", label, detail, description, kindLabel));
                         } else if (detail) {
-                            label = ( localize(1587, "{0} {1}, {2}", label, detail, kindLabel));
+                            label = ( localize(1613, "{0} {1}, {2}", label, detail, kindLabel));
                         } else if (description) {
-                            label = ( localize(1588, "{0}, {1}, {2}", label, description, kindLabel));
+                            label = ( localize(1614, "{0}, {1}, {2}", label, description, kindLabel));
                         }
                     } else {
-                        label = ( localize(1589, "{0}, {1}", label, kindLabel));
+                        label = ( localize(1615, "{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(1590, "{0}, docs: {1}", label, docs);
+                    return localize(1616, "{0}, docs: {1}", label, docs);
                 }
             }
         }));
@@ -317,6 +317,11 @@ let SuggestWidget = class SuggestWidget {
         this._showTimeout.dispose();
         this._contentWidget.dispose();
         this.element.dispose();
+        this._onDidSelect.dispose();
+        this._onDidFocus.dispose();
+        this._onDidHide.dispose();
+        this._onDidShow.dispose();
+        this._onDetailsKeydown.dispose();
     }
     _onEditorMouseDown(mouseEvent) {
         if (this._details.widget.domNode.contains(mouseEvent.target.element)) {

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(1591, "Close"));
+        this._close.title = ( localize(1617, "Close"));
         this._close.role = "button";
         this._close.tabIndex = -1;
         this._type = append(this._header, $("p.type"));
@@ -56,6 +56,8 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
     dispose() {
         this._disposables.dispose();
         this._renderDisposeable.dispose();
+        this._onDidClose.dispose();
+        this._onDidChangeContents.dispose();
     }
     _configureFont() {
         const options = this._editor.getOptions();
@@ -87,7 +89,7 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
         };
     }
     renderLoading() {
-        this._type.textContent = ( localize(1592, "Loading..."));
+        this._type.textContent = ( localize(1618, "Loading..."));
         this._docs.textContent = "";
         this.domNode.classList.remove("no-docs", "no-type");
         this.layout(this.size.width, this.getLayoutInfo().lineHeight * 2);