@codingame/monaco-vscode-api 4.5.2 → 5.0.1

package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget.js

@@ -15,6 +15,7 @@ import { MenuEntryActionViewItem, createAndFillInActionBarActions } from '../../
 import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -148,8 +149,8 @@ class StatusBarViewItem extends MenuEntryActionViewItem {
     }
 }
 let CustomizedMenuWorkbenchToolBar = class CustomizedMenuWorkbenchToolBar extends WorkbenchToolBar {
-    constructor(container, editor, menuId, options2, menuService, contextKeyService, contextMenuService, keybindingService, telemetryService) {
-        super(container, { resetMenu: menuId, ...options2 }, menuService, contextKeyService, contextMenuService, keybindingService, telemetryService);
+    constructor(container, editor, menuId, options2, menuService, contextKeyService, contextMenuService, keybindingService, commandService, telemetryService) {
+        super(container, { resetMenu: menuId, ...options2 }, menuService, contextKeyService, contextMenuService, keybindingService, commandService, telemetryService);
         this.editor = editor;
         this.menuId = menuId;
         this.options2 = options2;
@@ -190,6 +191,7 @@ CustomizedMenuWorkbenchToolBar = ( __decorate([
     ( __param(5, IContextKeyService)),
     ( __param(6, IContextMenuService)),
     ( __param(7, IKeybindingService)),
-    ( __param(8, ITelemetryService))
+    ( __param(8, ICommandService)),
+    ( __param(9, ITelemetryService))
 ], CustomizedMenuWorkbenchToolBar));
 export { CustomizedMenuWorkbenchToolBar, InlineEditHintsContentWidget, InlineEditHintsWidget };

package/vscode/src/vs/editor/contrib/inlineProgress/browser/inlineProgressWidget.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".inline-editor-progress-decoration{display:inline-block;height:1em;width:1em}.inline-progress-widget{align-items:center;display:flex!important;justify-content:center}.inline-progress-widget .icon{font-size:80%!important}.inline-progress-widget:hover .icon{animation:none;font-size:90%!important}.inline-progress-widget:hover .icon:before{content:\"\\ea76\"}";
+var css = ".inline-editor-progress-decoration{display:inline-block;height:1em;width:1em}.inline-progress-widget{align-items:center;display:flex!important;justify-content:center}.inline-progress-widget .icon{font-size:80%!important}.inline-progress-widget:hover .icon{animation:none;font-size:90%!important}.inline-progress-widget:hover .icon:before{content:var(--vscode-icon-x-content);font-family:var(--vscode-icon-x-font-family)}";
 n(css,{});
 export { css, css as default };

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

@@ -13,6 +13,7 @@ import { ICodeEditorService } from '../../../browser/services/codeEditorService.
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { NewSymbolNameTriggerKind } from '../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { ITextResourceConfigurationService } from '../../../common/services/textResourceConfiguration.js';
 import { EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
@@ -198,10 +199,21 @@ let RenameController = class RenameController {
         )));
         const model = this.editor.getModel();
         const newSymbolNamesProviders = this._languageFeaturesService.newSymbolNamesProvider.all(model);
-        const requestRenameSuggestions = (cts) => ( (newSymbolNamesProviders.map(p => p.provideNewSymbolNames(model, loc.range, cts))));
+        const resolvedNewSymbolnamesProviders = await Promise.all(( (newSymbolNamesProviders.map(
+            async (p) => [p, (await p.supportsAutomaticNewSymbolNamesTriggerKind) ?? false]
+        ))));
+        const requestRenameSuggestions = (triggerKind, cts) => {
+            let providers = resolvedNewSymbolnamesProviders.slice();
+            if (triggerKind === NewSymbolNameTriggerKind.Automatic) {
+                providers = providers.filter(([_, supportsAutomatic]) => supportsAutomatic);
+            }
+            return (
+                 (providers.map(([p,]) => p.provideNewSymbolNames(model, loc.range, triggerKind, cts)))
+            );
+        };
         trace('creating rename input field and awaiting its result');
         const supportPreview = this._bulkEditService.hasPreviewHandler() && this._configService.getValue(this.editor.getModel().uri, 'editor.rename.enablePreview');
-        const inputFieldResult = await this._renameWidget.getInput(loc.range, loc.text, supportPreview, requestRenameSuggestions, cts2);
+        const inputFieldResult = await this._renameWidget.getInput(loc.range, loc.text, supportPreview, newSymbolNamesProviders.length > 0 ? requestRenameSuggestions : undefined, cts2);
         trace('received response from rename input field');
         if (newSymbolNamesProviders.length > 0) {
             this._reportTelemetry(newSymbolNamesProviders.length, model.getLanguageId(), inputFieldResult);
@@ -300,6 +312,8 @@ let RenameController = class RenameController {
                 nRenameSuggestions: inputFieldResult.stats.nRenameSuggestions,
                 timeBeforeFirstInputFieldEdit: inputFieldResult.stats.timeBeforeFirstInputFieldEdit,
                 wantsPreview: inputFieldResult.wantsPreview,
+                nRenameSuggestionsInvocations: inputFieldResult.stats.nRenameSuggestionsInvocations,
+                hadAutomaticRenameSuggestionsInvocation: inputFieldResult.stats.hadAutomaticRenameSuggestionsInvocation,
             };
         this._telemetryService.publicLog2('renameInvokedEvent', value);
     }
@@ -407,8 +421,7 @@ registerAction2(class FocusNextRenameSuggestion extends Action2 {
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
                 {
-                    primary: 2 ,
-                    secondary: [18 ],
+                    primary: 18 ,
                     weight: 100  + 99,
                 }
             ]
@@ -436,8 +449,7 @@ registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
                 {
-                    primary: 1024  | 2 ,
-                    secondary: [16 ],
+                    primary: 16 ,
                     weight: 100  + 99,
                 }
             ]

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .rename-box{border-radius:4px;color:inherit;z-index:100}.monaco-editor .rename-box.preview{padding:4px 4px 0}.monaco-editor .rename-box .rename-input{border-radius:2px;padding:3px;width:calc(100% - 8px)}.monaco-editor .rename-box .rename-label{display:none;opacity:.8}.monaco-editor .rename-box.preview .rename-label{display:inherit}";
+var css = ".monaco-editor .rename-box{border-radius:4px;color:inherit;z-index:100}.monaco-editor .rename-box.preview{padding:4px 4px 0}.monaco-editor .rename-box .rename-input-with-button{border-radius:2px;padding:3px;width:calc(100% - 8px)}.monaco-editor .rename-box .rename-input{padding:0;width:calc(100% - 8px)}.monaco-editor .rename-box .rename-input:focus{outline:none}.monaco-editor .rename-box .rename-suggestions-button{align-items:center;background-color:transparent;border:none;border-radius:5px;cursor:pointer;display:flex;padding:3px}.monaco-editor .rename-box .rename-suggestions-button:hover{background-color:var(--vscode-toolbar-hoverBackground)}.monaco-editor .rename-box .rename-candidate-list-container .monaco-list-row{border-radius:2px}.monaco-editor .rename-box .rename-label{display:none;opacity:.8}.monaco-editor .rename-box.preview .rename-label{display:inherit}";
 n(css,{});
 export { css, css as default };

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

@@ -1,6 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { getClientArea, getDomNodePagePosition, getTotalHeight, getTotalWidth, addDisposableListener } from '../../../../base/browser/dom.js';
+import { getClientArea, getDomNodePagePosition, getTotalHeight, getTotalWidth, addDisposableListener, EventType, clearNode } from '../../../../base/browser/dom.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
+import { getBaseLayerHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate2.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { renderIcon } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { List } from '../../../../base/browser/ui/list/listWidget.js';
 import { distinct } from '../../../../base/common/arrays.js';
@@ -15,7 +18,7 @@ import './renameWidget.css.js';
 import { applyFontInfo } from '../../../browser/config/domFontInfo.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
-import { NewSymbolNameTag } from '../../../common/languages.js';
+import { NewSymbolNameTriggerKind, NewSymbolNameTag } from '../../../common/languages.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -26,7 +29,7 @@ import '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
 import { widgetShadow, widgetBorder, editorWidgetBackground } from '../../../../platform/theme/common/colors/editorColors.js';
-import { inputForeground, inputBackground, inputBorder } from '../../../../platform/theme/common/colors/inputColors.js';
+import { inputForeground, inputBorder, inputBackground } from '../../../../platform/theme/common/colors/inputColors.js';
 import '../../../../platform/theme/common/colors/listColors.js';
 import '../../../../platform/theme/common/colors/menuColors.js';
 import '../../../../platform/theme/common/colors/minimapColors.js';
@@ -47,9 +50,12 @@ let RenameWidget = class RenameWidget {
         this._disposables = ( (new DisposableStore()));
         this._visibleContextKey = CONTEXT_RENAME_INPUT_VISIBLE.bindTo(contextKeyService);
         this._isEditingRenameCandidate = false;
+        this._nRenameSuggestionsInvocations = 0;
+        this._hadAutomaticRenameSuggestionsInvocation = false;
+        this._candidates = ( (new Set()));
         this._beforeFirstInputFieldEditSW = ( (new StopWatch()));
-        this._input = ( (new RenameInput()));
-        this._disposables.add(this._input);
+        this._inputWithButton = ( (new InputWithButton()));
+        this._disposables.add(this._inputWithButton);
         this._editor.addContentWidget(this);
         this._disposables.add(this._editor.onDidChangeConfiguration(e => {
             if (e.hasChanged(50 )) {
@@ -69,11 +75,11 @@ let RenameWidget = class RenameWidget {
         if (!this._domNode) {
             this._domNode = document.createElement('div');
             this._domNode.className = 'monaco-editor rename-box';
-            this._domNode.appendChild(this._input.domNode);
+            this._domNode.appendChild(this._inputWithButton.domNode);
             this._renameCandidateListView = this._disposables.add(( (new RenameCandidateListView(this._domNode, {
                 fontInfo: this._editor.getOption(50 ),
                 onFocusChange: (newSymbolName) => {
-                    this._input.domNode.value = newSymbolName;
+                    this._inputWithButton.input.value = newSymbolName;
                     this._isEditingRenameCandidate = false;
                 },
                 onSelectionChange: () => {
@@ -81,7 +87,7 @@ let RenameWidget = class RenameWidget {
                     this.acceptInput(false);
                 }
             }))));
-            this._disposables.add(this._input.onDidChange(() => {
+            this._disposables.add(this._inputWithButton.onDidInputChange(() => {
                 if (this._renameCandidateListView?.focusedCandidate !== undefined) {
                     this._isEditingRenameCandidate = true;
                 }
@@ -109,18 +115,19 @@ let RenameWidget = class RenameWidget {
         this._domNode.style.boxShadow = widgetShadowColor ? ` 0 0 8px 2px ${widgetShadowColor}` : '';
         this._domNode.style.border = widgetBorderColor ? `1px solid ${widgetBorderColor}` : '';
         this._domNode.style.color = String(theme.getColor(inputForeground) ?? '');
-        this._input.domNode.style.backgroundColor = String(theme.getColor(inputBackground) ?? '');
         const border = theme.getColor(inputBorder);
-        this._input.domNode.style.borderWidth = border ? '1px' : '0px';
-        this._input.domNode.style.borderStyle = border ? 'solid' : 'none';
-        this._input.domNode.style.borderColor = border?.toString() ?? 'none';
+        this._inputWithButton.domNode.style.backgroundColor = String(theme.getColor(inputBackground) ?? '');
+        this._inputWithButton.input.style.backgroundColor = String(theme.getColor(inputBackground) ?? '');
+        this._inputWithButton.domNode.style.borderWidth = border ? '1px' : '0px';
+        this._inputWithButton.domNode.style.borderStyle = border ? 'solid' : 'none';
+        this._inputWithButton.domNode.style.borderColor = border?.toString() ?? 'none';
     }
     _updateFont() {
         if (this._domNode === undefined) {
             return;
         }
         assertType(this._label !== undefined, 'RenameWidget#_updateFont: _label must not be undefined given _domNode is defined');
-        this._editor.applyFontInfo(this._input.domNode);
+        this._editor.applyFontInfo(this._inputWithButton.input);
         const fontInfo = this._editor.getOption(50 );
         this._label.style.fontSize = `${this._computeLabelFontSize(fontInfo.fontSize)}px`;
     }
@@ -177,7 +184,7 @@ let RenameWidget = class RenameWidget {
         assertType(this._renameCandidateListView);
         assertType(this._nPxAvailableAbove !== undefined);
         assertType(this._nPxAvailableBelow !== undefined);
-        const inputBoxHeight = getTotalHeight(this._input.domNode);
+        const inputBoxHeight = getTotalHeight(this._inputWithButton.domNode);
         const labelHeight = getTotalHeight(this._label);
         let totalHeightAvailable;
         if (position === 2 ) {
@@ -188,7 +195,7 @@ let RenameWidget = class RenameWidget {
         }
         this._renameCandidateListView.layout({
             height: totalHeightAvailable - labelHeight - inputBoxHeight,
-            width: getTotalWidth(this._input.domNode),
+            width: getTotalWidth(this._inputWithButton.domNode),
         });
     }
     acceptInput(wantsPreview) {
@@ -201,36 +208,57 @@ let RenameWidget = class RenameWidget {
     }
     focusNextRenameSuggestion() {
         if (!this._renameCandidateListView?.focusNext()) {
-            this._input.domNode.value = this._currentName;
+            this._inputWithButton.input.value = this._currentName;
         }
     }
     focusPreviousRenameSuggestion() {
         if (!this._renameCandidateListView?.focusPrevious()) {
-            this._input.domNode.value = this._currentName;
+            this._inputWithButton.input.value = this._currentName;
         }
     }
     getInput(where, currentName, supportPreview, requestRenameCandidates, cts) {
         const { start: selectionStart, end: selectionEnd } = this._getSelection(where, currentName);
-        this._renameCandidateProvidersCts = ( (new CancellationTokenSource()));
-        const candidates = requestRenameCandidates(this._renameCandidateProvidersCts.token);
-        this._updateRenameCandidates(candidates, currentName, cts.token);
+        this._renameCts = cts;
+        const disposeOnDone = ( (new DisposableStore()));
+        this._nRenameSuggestionsInvocations = 0;
+        this._hadAutomaticRenameSuggestionsInvocation = false;
+        if (requestRenameCandidates === undefined) {
+            this._inputWithButton.button.style.display = 'none';
+        }
+        else {
+            this._inputWithButton.button.style.display = 'flex';
+            this._requestRenameCandidatesOnce = requestRenameCandidates;
+            this._requestRenameCandidates(currentName, false);
+            disposeOnDone.add(addDisposableListener(this._inputWithButton.button, 'click', () => this._requestRenameCandidates(currentName, true)));
+            disposeOnDone.add(addDisposableListener(this._inputWithButton.button, EventType.KEY_DOWN, (e) => {
+                const keyEvent = ( (new StandardKeyboardEvent(e)));
+                if (keyEvent.equals(3 ) || keyEvent.equals(10 )) {
+                    keyEvent.stopPropagation();
+                    keyEvent.preventDefault();
+                    this._requestRenameCandidates(currentName, true);
+                }
+            }));
+        }
         this._isEditingRenameCandidate = false;
         this._domNode.classList.toggle('preview', supportPreview);
         this._position = ( (new Position(where.startLineNumber, where.startColumn)));
         this._currentName = currentName;
-        this._input.domNode.value = currentName;
-        this._input.domNode.setAttribute('selectionStart', ( (selectionStart.toString())));
-        this._input.domNode.setAttribute('selectionEnd', ( (selectionEnd.toString())));
-        this._input.domNode.size = Math.max((where.endColumn - where.startColumn) * 1.1, 20);
+        this._inputWithButton.input.value = currentName;
+        this._inputWithButton.input.setAttribute('selectionStart', ( (selectionStart.toString())));
+        this._inputWithButton.input.setAttribute('selectionEnd', ( (selectionEnd.toString())));
+        this._inputWithButton.input.size = Math.max((where.endColumn - where.startColumn) * 1.1, 20);
         this._beforeFirstInputFieldEditSW.reset();
-        const disposeOnDone = ( (new DisposableStore()));
-        disposeOnDone.add(toDisposable(() => cts.dispose(true)));
+        disposeOnDone.add(toDisposable(() => {
+            this._renameCts = undefined;
+            cts.dispose(true);
+        }));
         disposeOnDone.add(toDisposable(() => {
             if (this._renameCandidateProvidersCts !== undefined) {
                 this._renameCandidateProvidersCts.dispose(true);
                 this._renameCandidateProvidersCts = undefined;
             }
         }));
+        disposeOnDone.add(toDisposable(() => this._candidates.clear()));
         const inputResult = ( (new DeferredPromise()));
         inputResult.p.finally(() => {
             disposeOnDone.dispose();
@@ -258,7 +286,7 @@ let RenameWidget = class RenameWidget {
             }
             else {
                 this._trace('using new name from inputField');
-                newName = this._input.domNode.value;
+                newName = this._inputWithButton.input.value;
                 source = this._isEditingRenameCandidate ? { k: 'userEditedRenameSuggestion' } : { k: 'inputField' };
             }
             if (newName === currentName || newName.trim().length === 0 ) {
@@ -275,6 +303,8 @@ let RenameWidget = class RenameWidget {
                     source,
                     nRenameSuggestions,
                     timeBeforeFirstInputFieldEdit: this._timeBeforeFirstInputFieldEdit,
+                    nRenameSuggestionsInvocations: this._nRenameSuggestionsInvocations,
+                    hadAutomaticRenameSuggestionsInvocation: this._hadAutomaticRenameSuggestionsInvocation,
                 }
             });
         };
@@ -285,6 +315,30 @@ let RenameWidget = class RenameWidget {
         this._show();
         return inputResult.p;
     }
+    _requestRenameCandidates(currentName, isManuallyTriggered) {
+        if (this._requestRenameCandidatesOnce === undefined) {
+            return;
+        }
+        if (this._renameCandidateProvidersCts !== undefined) {
+            this._renameCandidateProvidersCts.dispose(true);
+        }
+        assertType(this._renameCts);
+        if (this._inputWithButton.buttonState !== 'stop') {
+            this._renameCandidateProvidersCts = ( (new CancellationTokenSource()));
+            const triggerKind = isManuallyTriggered ? NewSymbolNameTriggerKind.Invoke : NewSymbolNameTriggerKind.Automatic;
+            const candidates = this._requestRenameCandidatesOnce(triggerKind, this._renameCandidateProvidersCts.token);
+            if (candidates.length === 0) {
+                this._inputWithButton.setSparkleButton();
+                return;
+            }
+            if (!isManuallyTriggered) {
+                this._hadAutomaticRenameSuggestionsInvocation = true;
+            }
+            this._nRenameSuggestionsInvocations += 1;
+            this._inputWithButton.setStopButton();
+            this._updateRenameCandidates(candidates, currentName, this._renameCts.token);
+        }
+    }
     _getSelection(where, currentName) {
         assertType(this._editor.hasModel());
         const selection = this._editor.getSelection();
@@ -303,14 +357,15 @@ let RenameWidget = class RenameWidget {
         this._visibleContextKey.set(true);
         this._editor.layoutContentWidget(this);
         setTimeout(() => {
-            this._input.domNode.focus();
-            this._input.domNode.setSelectionRange(parseInt(this._input.domNode.getAttribute('selectionStart')), parseInt(this._input.domNode.getAttribute('selectionEnd')));
+            this._inputWithButton.input.focus();
+            this._inputWithButton.input.setSelectionRange(parseInt(this._inputWithButton.input.getAttribute('selectionStart')), parseInt(this._inputWithButton.input.getAttribute('selectionEnd')));
         }, 100);
     }
     async _updateRenameCandidates(candidates, currentName, token) {
         const trace = (...args) => this._trace('_updateRenameCandidates', ...args);
         trace('start');
         const namesListResults = await raceCancellation(Promise.allSettled(candidates), token);
+        this._inputWithButton.setSparkleButton();
         if (namesListResults === undefined) {
             trace('returning early - received updateRenameCandidates results - undefined');
             return;
@@ -321,8 +376,9 @@ let RenameWidget = class RenameWidget {
         trace(`received updateRenameCandidates results - total (unfiltered) ${newNames.length} candidates.`);
         const distinctNames = distinct(newNames, v => v.newSymbolName);
         trace(`distinct candidates - ${distinctNames.length} candidates.`);
-        const validDistinctNames = distinctNames.filter(({ newSymbolName }) => newSymbolName.trim().length > 0 && newSymbolName !== this._input.domNode.value && newSymbolName !== currentName);
+        const validDistinctNames = distinctNames.filter(({ newSymbolName }) => newSymbolName.trim().length > 0 && newSymbolName !== this._inputWithButton.input.value && newSymbolName !== currentName && !( (this._candidates.has(newSymbolName))));
         trace(`valid distinct candidates - ${newNames.length} candidates.`);
+        validDistinctNames.forEach(n => this._candidates.add(n.newSymbolName));
         if (validDistinctNames.length < 1) {
             trace('returning early - no valid distinct candidates');
             return;
@@ -368,6 +424,7 @@ class RenameCandidateListView {
         this._lineHeight = opts.fontInfo.lineHeight;
         this._typicalHalfwidthCharacterWidth = opts.fontInfo.typicalHalfwidthCharacterWidth;
         this._listContainer = document.createElement('div');
+        this._listContainer.className = 'rename-box rename-candidate-list-container';
         parent.appendChild(this._listContainer);
         this._listWidget = RenameCandidateListView._createListWidget(this._listContainer, this._candidateViewHeight, opts.fontInfo);
         this._listWidget.onDidChangeFocus(e => {
@@ -398,7 +455,7 @@ class RenameCandidateListView {
     }
     setCandidates(candidates) {
         this._listWidget.splice(0, 0, candidates);
-        const height = this._pickListHeight(candidates.length);
+        const height = this._pickListHeight(this._listWidget.length);
         const width = this._pickListWidth(candidates);
         this._listWidget.layout(height, width);
         this._listContainer.style.height = `${height}px`;
@@ -434,15 +491,19 @@ class RenameCandidateListView {
         const focusedIxs = this._listWidget.getFocus();
         if (focusedIxs.length === 0) {
             this._listWidget.focusFirst();
+            this._listWidget.reveal(0);
             return true;
         }
         else {
             if (focusedIxs[0] === this._listWidget.length - 1) {
                 this._listWidget.setFocus([]);
+                this._listWidget.reveal(0);
                 return false;
             }
             else {
                 this._listWidget.focusNext();
+                const focused = this._listWidget.getFocus()[0];
+                this._listWidget.reveal(focused);
                 return true;
             }
         }
@@ -454,6 +515,8 @@ class RenameCandidateListView {
         const focusedIxs = this._listWidget.getFocus();
         if (focusedIxs.length === 0) {
             this._listWidget.focusLast();
+            const focused = this._listWidget.getFocus()[0];
+            this._listWidget.reveal(focused);
             return true;
         }
         else {
@@ -463,6 +526,8 @@ class RenameCandidateListView {
             }
             else {
                 this._listWidget.focusPrevious();
+                const focused = this._listWidget.getFocus()[0];
+                this._listWidget.reveal(focused);
                 return true;
             }
         }
@@ -520,24 +585,83 @@ class RenameCandidateListView {
         );
     }
 }
-class RenameInput {
+class InputWithButton {
     constructor() {
-        this._onDidChange = ( (new Emitter()));
-        this.onDidChange = this._onDidChange.event;
+        this._onDidInputChange = ( (new Emitter()));
+        this.onDidInputChange = this._onDidInputChange.event;
         this._disposables = ( (new DisposableStore()));
     }
     get domNode() {
         if (!this._domNode) {
-            this._domNode = document.createElement('input');
-            this._domNode.className = 'rename-input';
-            this._domNode.type = 'text';
-            this._domNode.setAttribute('aria-label', ( localizeWithPath(_moduleId, 4, "Rename input. Type new name and press Enter to commit.")));
-            this._disposables.add(addDisposableListener(this._domNode, 'input', () => this._onDidChange.fire()));
+            this._domNode = document.createElement('div');
+            this._domNode.className = 'rename-input-with-button';
+            this._domNode.style.display = 'flex';
+            this._domNode.style.flexDirection = 'row';
+            this._domNode.style.alignItems = 'center';
+            this._inputNode = document.createElement('input');
+            this._inputNode.className = 'rename-input';
+            this._inputNode.type = 'text';
+            this._inputNode.style.border = 'none';
+            this._inputNode.setAttribute('aria-label', ( localizeWithPath(_moduleId, 4, "Rename input. Type new name and press Enter to commit.")));
+            this._domNode.appendChild(this._inputNode);
+            this._buttonNode = document.createElement('div');
+            this._buttonNode.className = 'rename-suggestions-button';
+            this._buttonNode.setAttribute('tabindex', '0');
+            this._buttonGenHoverText = ( localizeWithPath(_moduleId, 5, "Generate new name suggestions"));
+            this._buttonCancelHoverText = ( localizeWithPath(_moduleId, 6, "Cancel"));
+            this._buttonHover = getBaseLayerHoverDelegate().setupUpdatableHover(getDefaultHoverDelegate('element'), this._buttonNode, this._buttonGenHoverText);
+            this._disposables.add(this._buttonHover);
+            this._domNode.appendChild(this._buttonNode);
+            this._disposables.add(addDisposableListener(this.input, EventType.INPUT, () => this._onDidInputChange.fire()));
+            this._disposables.add(addDisposableListener(this.input, EventType.KEY_DOWN, (e) => {
+                const keyEvent = ( (new StandardKeyboardEvent(e)));
+                if (keyEvent.keyCode === 15  || keyEvent.keyCode === 17 ) {
+                    this._onDidInputChange.fire();
+                }
+            }));
+            this._disposables.add(addDisposableListener(this.input, EventType.CLICK, () => this._onDidInputChange.fire()));
+            this._disposables.add(addDisposableListener(this.input, EventType.FOCUS, () => {
+                this.domNode.style.outlineWidth = '1px';
+                this.domNode.style.outlineStyle = 'solid';
+                this.domNode.style.outlineOffset = '-1px';
+                this.domNode.style.outlineColor = 'var(--vscode-focusBorder)';
+            }));
+            this._disposables.add(addDisposableListener(this.input, EventType.BLUR, () => {
+                this.domNode.style.outline = 'none';
+            }));
         }
         return this._domNode;
     }
+    get input() {
+        assertType(this._inputNode);
+        return this._inputNode;
+    }
+    get button() {
+        assertType(this._buttonNode);
+        return this._buttonNode;
+    }
+    get buttonState() {
+        return this._buttonState;
+    }
+    setSparkleButton() {
+        this._buttonState = 'sparkle';
+        this._sparkleIcon ??= renderIcon(Codicon.sparkle);
+        clearNode(this.button);
+        this.button.appendChild(this._sparkleIcon);
+        this.button.setAttribute('aria-label', 'Generating new name suggestions');
+        this._buttonHover?.update(this._buttonGenHoverText);
+        this.input.focus();
+    }
+    setStopButton() {
+        this._buttonState = 'stop';
+        this._stopIcon ??= renderIcon(Codicon.primitiveSquare);
+        clearNode(this.button);
+        this.button.appendChild(this._stopIcon);
+        this.button.setAttribute('aria-label', 'Cancel generating new name suggestions');
+        this._buttonHover?.update(this._buttonCancelHoverText);
+        this.input.focus();
+    }
     dispose() {
-        this._onDidChange.dispose();
         this._disposables.dispose();
     }
 }
@@ -545,6 +669,7 @@ class RenameCandidateView {
     static { this._PADDING = 2; }
     constructor(parent, fontInfo) {
         this._domNode = document.createElement('div');
+        this._domNode.className = 'rename-box rename-candidate';
         this._domNode.style.display = `flex`;
         this._domNode.style.columnGap = `5px`;
         this._domNode.style.alignItems = `center`;

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

@@ -49,6 +49,11 @@ let SectionHeaderDetector = class SectionHeaderDetector extends Disposable {
         this._register(this.editor.onDidChangeModelContent(e => {
             this.computeSectionHeaders.schedule();
         }));
+        this._register(editor.onDidChangeModelTokens((e) => {
+            if (!this.computeSectionHeaders.isScheduled()) {
+                this.computeSectionHeaders.schedule(1000);
+            }
+        }));
         this.computeSectionHeaders = this._register(( new RunOnceScheduler(() => {
             this.findSectionHeaders();
         }, 250)));

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

@@ -240,7 +240,7 @@ registerEditorCommand(( (new CommandCtor({
     handler: ctrl => ctrl.next(),
     kbOpts: {
         weight: 100  + 30,
-        kbExpr: EditorContextKeys.editorTextFocus,
+        kbExpr: EditorContextKeys.textInputFocus,
         primary: 2
     }
 }))));
@@ -250,7 +250,7 @@ registerEditorCommand(( (new CommandCtor({
     handler: ctrl => ctrl.prev(),
     kbOpts: {
         weight: 100  + 30,
-        kbExpr: EditorContextKeys.editorTextFocus,
+        kbExpr: EditorContextKeys.textInputFocus,
         primary: 1024  | 2
     }
 }))));
@@ -260,7 +260,7 @@ registerEditorCommand(( (new CommandCtor({
     handler: ctrl => ctrl.cancel(true),
     kbOpts: {
         weight: 100  + 30,
-        kbExpr: EditorContextKeys.editorTextFocus,
+        kbExpr: EditorContextKeys.textInputFocus,
         primary: 9 ,
         secondary: [1024  | 9 ]
     }

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

@@ -15,11 +15,18 @@ class ToggleStickyScroll extends Action2 {
                 ...( localize2WithPath(_moduleId, 0, "Toggle Editor Sticky Scroll")),
                 mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Toggle Editor Sticky Scroll")),
             },
+            metadata: {
+                description: ( localize2WithPath(
+                    _moduleId,
+                    2,
+                    "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: ( localizeWithPath(_moduleId, 2, "Sticky Scroll")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 3, "&&Sticky Scroll")),
+                title: ( localizeWithPath(_moduleId, 3, "Sticky Scroll")),
+                mnemonicTitle: ( localizeWithPath(_moduleId, 4, "&&Sticky Scroll")),
             },
             menu: [
                 { id: MenuId.CommandPalette },
@@ -40,8 +47,8 @@ class FocusStickyScroll extends EditorAction2 {
         super({
             id: 'editor.action.focusStickyScroll',
             title: {
-                ...( localize2WithPath(_moduleId, 4, "Focus Sticky Scroll")),
-                mnemonicTitle: ( localizeWithPath(_moduleId, 5, "&&Focus Sticky Scroll")),
+                ...( localize2WithPath(_moduleId, 5, "Focus on the editor sticky scroll")),
+                mnemonicTitle: ( localizeWithPath(_moduleId, 6, "&&Focus Sticky Scroll")),
             },
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.has('config.editor.stickyScroll.enabled')),
@@ -60,7 +67,7 @@ class SelectNextStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectNextStickyScrollLine',
-            title: ( localize2WithPath(_moduleId, 6, "Select next sticky scroll line")),
+            title: ( localize2WithPath(_moduleId, 7, "Select the next editor sticky scroll line")),
             precondition: ( (EditorContextKeys.stickyScrollFocused.isEqualTo(true))),
             keybinding: {
                 weight,
@@ -76,7 +83,7 @@ class SelectPreviousStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectPreviousStickyScrollLine',
-            title: ( localize2WithPath(_moduleId, 7, "Select previous sticky scroll line")),
+            title: ( localize2WithPath(_moduleId, 8, "Select the previous sticky scroll line")),
             precondition: ( (EditorContextKeys.stickyScrollFocused.isEqualTo(true))),
             keybinding: {
                 weight,
@@ -92,7 +99,7 @@ class GoToStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.goToFocusedStickyScrollLine',
-            title: ( localize2WithPath(_moduleId, 8, "Go to focused sticky scroll line")),
+            title: ( localize2WithPath(_moduleId, 9, "Go to the focused sticky scroll line")),
             precondition: ( (EditorContextKeys.stickyScrollFocused.isEqualTo(true))),
             keybinding: {
                 weight,
@@ -108,7 +115,7 @@ class SelectEditor extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectEditor',
-            title: ( localize2WithPath(_moduleId, 9, "Select Editor")),
+            title: ( localize2WithPath(_moduleId, 10, "Select Editor")),
             precondition: ( (EditorContextKeys.stickyScrollFocused.isEqualTo(true))),
             keybinding: {
                 weight,