@codingame/monaco-vscode-api 16.1.1 → 17.1.0

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

@@ -9,6 +9,16 @@ import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
+import { localize, localize2 } from '../../../../nls.js';
+import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { Extensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { ILogService } from '../../../../platform/log/common/log.service.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
 import { EditorAction, registerEditorContribution, EditorContributionInstantiation, registerEditorAction, EditorCommand, registerEditorCommand, registerModelAndPositionCommand } from '../../../browser/editorExtensions.js';
 import { IBulkEditService } from '../../../browser/services/bulkEditService.service.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.service.js';
@@ -20,17 +30,6 @@ import { ILanguageFeaturesService } from '../../../common/services/languageFeatu
 import { ITextResourceConfigurationService } from '../../../common/services/textResourceConfiguration.service.js';
 import { EditorStateCancellationTokenSource, CodeEditorStateFlag } from '../../editorState/browser/editorState.js';
 import { MessageController } from '../../message/browser/messageController.js';
-import { localize, localize2 } from '../../../../nls.js';
-import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
-import { Extensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
-import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { ILogService } from '../../../../platform/log/common/log.service.js';
-import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
-import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
-import { Registry } from '../../../../platform/registry/common/platform.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { RenameWidget, CONTEXT_RENAME_INPUT_VISIBLE } from './renameWidget.js';
 
 var RenameController_1;
@@ -94,7 +93,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(1431, "No result."))), token);
+            return this._provideRenameEdits(newName, i + 1, rejects.concat(( localize(1428, "No result."))), token);
         }
         else if (result.rejectReason) {
             return this._provideRenameEdits(newName, i + 1, rejects.concat(result.rejectReason), token);
@@ -116,7 +115,7 @@ let RenameController = class RenameController {
     static get(editor) {
         return editor.getContribution(RenameController_1.ID);
     }
-    constructor(editor, _instaService, _notificationService, _bulkEditService, _progressService, _logService, _configService, _languageFeaturesService, _telemetryService) {
+    constructor(editor, _instaService, _notificationService, _bulkEditService, _progressService, _logService, _configService, _languageFeaturesService) {
         this.editor = editor;
         this._instaService = _instaService;
         this._notificationService = _notificationService;
@@ -125,7 +124,6 @@ let RenameController = class RenameController {
         this._logService = _logService;
         this._configService = _configService;
         this._languageFeaturesService = _languageFeaturesService;
-        this._telemetryService = _telemetryService;
         this._disposableStore = ( new DisposableStore());
         this._cts = ( new CancellationTokenSource());
         this._renameWidget = this._disposableStore.add(this._instaService.createInstance(RenameWidget, this.editor, ['acceptRenameInput', 'acceptRenameInputWithPreview']));
@@ -173,7 +171,7 @@ let RenameController = class RenameController {
             else {
                 trace('resolve rename location failed', e instanceof Error ? e : JSON.stringify(e, null, '\t'));
                 if (typeof e === 'string' || isMarkdownString(e)) {
-                    MessageController.get(this.editor)?.showMessage(e || ( localize(1432, "An unknown error occurred while resolving rename location")), position);
+                    MessageController.get(this.editor)?.showMessage(e || ( localize(1429, "An unknown error occurred while resolving rename location")), position);
                 }
             }
             return undefined;
@@ -216,9 +214,6 @@ let RenameController = class RenameController {
         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, newSymbolNamesProviders.length > 0 ? requestRenameSuggestions : undefined, cts2);
         trace('received response from rename input field');
-        if (newSymbolNamesProviders.length > 0) {
-            this._reportTelemetry(newSymbolNamesProviders.length, model.getLanguageId(), inputFieldResult);
-        }
         if (typeof inputFieldResult === 'boolean') {
             trace(`returning early - rename input field response - ${inputFieldResult}`);
             if (inputFieldResult) {
@@ -248,15 +243,15 @@ let RenameController = class RenameController {
             this._bulkEditService.apply(renameResult, {
                 editor: this.editor,
                 showPreview: inputFieldResult.wantsPreview,
-                label: ( localize(1433, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
+                label: ( localize(1430, "Renaming '{0}' to '{1}'", loc?.text, inputFieldResult.newName)),
                 code: 'undoredo.rename',
-                quotableLabel: ( localize(1434, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
+                quotableLabel: ( localize(1431, "Renaming {0} to {1}", loc?.text, inputFieldResult.newName)),
                 respectAutoSaveConfig: true
             }).then(result => {
                 trace('edits applied');
                 if (result.ariaSummary) {
                     alert(( localize(
-                        1435,
+                        1432,
                         "Successfully renamed '{0}' to '{1}'. Summary: {2}",
                         loc.text,
                         inputFieldResult.newName,
@@ -265,12 +260,12 @@ let RenameController = class RenameController {
                 }
             }).catch(err => {
                 trace(`error when applying edits ${JSON.stringify(err, null, '\t')}`);
-                this._notificationService.error(( localize(1436, "Rename failed to apply edits")));
+                this._notificationService.error(( localize(1433, "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(1437, "Rename failed to compute edits")));
+            this._notificationService.error(( localize(1434, "Rename failed to compute edits")));
             this._logService.error(err);
         }).finally(() => {
             cts2.dispose();
@@ -291,26 +286,6 @@ let RenameController = class RenameController {
     focusPreviousRenameSuggestion() {
         this._renameWidget.focusPreviousRenameSuggestion();
     }
-    _reportTelemetry(nRenameSuggestionProviders, languageId, inputFieldResult) {
-        const value = typeof inputFieldResult === 'boolean'
-            ? {
-                kind: 'cancelled',
-                languageId,
-                nRenameSuggestionProviders,
-            }
-            : {
-                kind: 'accepted',
-                languageId,
-                nRenameSuggestionProviders,
-                source: inputFieldResult.stats.source.k,
-                nRenameSuggestions: inputFieldResult.stats.nRenameSuggestions,
-                timeBeforeFirstInputFieldEdit: inputFieldResult.stats.timeBeforeFirstInputFieldEdit,
-                wantsPreview: inputFieldResult.wantsPreview,
-                nRenameSuggestionsInvocations: inputFieldResult.stats.nRenameSuggestionsInvocations,
-                hadAutomaticRenameSuggestionsInvocation: inputFieldResult.stats.hadAutomaticRenameSuggestionsInvocation,
-            };
-        this._telemetryService.publicLog2('renameInvokedEvent', value);
-    }
 };
 RenameController = RenameController_1 = ( __decorate([
     ( __param(1, IInstantiationService)),
@@ -319,14 +294,13 @@ RenameController = RenameController_1 = ( __decorate([
     ( __param(4, IEditorProgressService)),
     ( __param(5, ILogService)),
     ( __param(6, ITextResourceConfigurationService)),
-    ( __param(7, ILanguageFeaturesService)),
-    ( __param(8, ITelemetryService))
+    ( __param(7, ILanguageFeaturesService))
 ], RenameController));
 class RenameAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.rename',
-            label: ( localize2(1438, "Rename Symbol")),
+            label: ( localize2(1435, "Rename Symbol")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasRenameProvider)),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -406,7 +380,7 @@ registerAction2(class FocusNextRenameSuggestion extends Action2 {
         super({
             id: 'focusNextRenameSuggestion',
             title: {
-                ...( localize2(1439, "Focus Next Rename Suggestion")),
+                ...( localize2(1436, "Focus Next Rename Suggestion")),
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
@@ -434,7 +408,7 @@ registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
         super({
             id: 'focusPreviousRenameSuggestion',
             title: {
-                ...( localize2(1440, "Focus Previous Rename Suggestion")),
+                ...( localize2(1437, "Focus Previous Rename Suggestion")),
             },
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
@@ -477,7 +451,7 @@ registerModelAndPositionCommand('_executePrepareRename', async function (accesso
     properties: {
         'editor.rename.enablePreview': {
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
-            description: ( localize(1441, "Enable/disable the ability to preview changes before renaming")),
+            description: ( localize(1438, "Enable/disable the ability to preview changes before renaming")),
             default: true,
             type: 'boolean'
         }

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

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

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

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

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

@@ -33,9 +33,9 @@ let SnippetController2 = class SnippetController2 {
     static get(editor) {
         return editor.getContribution(SnippetController2_1.ID);
     }
-    static { this.InSnippetMode = ( new RawContextKey('inSnippetMode', false, ( localize(1452, "Whether the editor in current in snippet mode")))); }
-    static { this.HasNextTabstop = ( new RawContextKey('hasNextTabstop', false, ( localize(1453, "Whether there is a next tab stop when in snippet mode")))); }
-    static { this.HasPrevTabstop = ( new RawContextKey('hasPrevTabstop', false, ( localize(1454, "Whether there is a previous tab stop when in snippet mode")))); }
+    static { this.InSnippetMode = ( new RawContextKey('inSnippetMode', false, ( localize(1449, "Whether the editor in current in snippet mode")))); }
+    static { this.HasNextTabstop = ( new RawContextKey('hasNextTabstop', false, ( localize(1450, "Whether there is a next tab stop when in snippet mode")))); }
+    static { this.HasPrevTabstop = ( new RawContextKey('hasPrevTabstop', false, ( localize(1451, "Whether there is a previous tab stop when in snippet mode")))); }
     constructor(_editor, _logService, _languageFeaturesService, contextKeyService, _languageConfigurationService) {
         this._editor = _editor;
         this._logService = _logService;
@@ -124,7 +124,7 @@ let SnippetController2 = class SnippetController2 {
                             sortText: 'a'.repeat(i + 1),
                             range: activeChoice.range,
                             filterText: isAnyOfOptions ? `${word}_${option.value}` : undefined,
-                            command: { id: 'jumpToNextSnippetPlaceholder', title: ( localize(1455, 'Go to next placeholder...')) }
+                            command: { id: 'jumpToNextSnippetPlaceholder', title: ( localize(1452, 'Go to next placeholder...')) }
                         });
                     }
                     return { suggestions };

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

@@ -214,10 +214,10 @@ class TimeBasedVariableResolver {
     constructor() {
         this._date = ( new Date());
     }
-    static { this.dayNames = [( localize(1456, "Sunday")), ( localize(1457, "Monday")), ( localize(1458, "Tuesday")), ( localize(1459, "Wednesday")), ( localize(1460, "Thursday")), ( localize(1461, "Friday")), ( localize(1462, "Saturday"))]; }
-    static { this.dayNamesShort = [( localize(1463, "Sun")), ( localize(1464, "Mon")), ( localize(1465, "Tue")), ( localize(1466, "Wed")), ( localize(1467, "Thu")), ( localize(1468, "Fri")), ( localize(1469, "Sat"))]; }
-    static { this.monthNames = [( localize(1470, "January")), ( localize(1471, "February")), ( localize(1472, "March")), ( localize(1473, "April")), ( localize(1474, "May")), ( localize(1475, "June")), ( localize(1476, "July")), ( localize(1477, "August")), ( localize(1478, "September")), ( localize(1479, "October")), ( localize(1480, "November")), ( localize(1481, "December"))]; }
-    static { this.monthNamesShort = [( localize(1482, "Jan")), ( localize(1483, "Feb")), ( localize(1484, "Mar")), ( localize(1485, "Apr")), ( localize(1486, "May")), ( localize(1487, "Jun")), ( localize(1488, "Jul")), ( localize(1489, "Aug")), ( localize(1490, "Sep")), ( localize(1491, "Oct")), ( localize(1492, "Nov")), ( localize(1493, "Dec"))]; }
+    static { this.dayNames = [( localize(1453, "Sunday")), ( localize(1454, "Monday")), ( localize(1455, "Tuesday")), ( localize(1456, "Wednesday")), ( localize(1457, "Thursday")), ( localize(1458, "Friday")), ( localize(1459, "Saturday"))]; }
+    static { this.dayNamesShort = [( localize(1460, "Sun")), ( localize(1461, "Mon")), ( localize(1462, "Tue")), ( localize(1463, "Wed")), ( localize(1464, "Thu")), ( localize(1465, "Fri")), ( localize(1466, "Sat"))]; }
+    static { this.monthNames = [( localize(1467, "January")), ( localize(1468, "February")), ( localize(1469, "March")), ( localize(1470, "April")), ( localize(1471, "May")), ( localize(1472, "June")), ( localize(1473, "July")), ( localize(1474, "August")), ( localize(1475, "September")), ( localize(1476, "October")), ( localize(1477, "November")), ( localize(1478, "December"))]; }
+    static { this.monthNamesShort = [( localize(1479, "Jan")), ( localize(1480, "Feb")), ( localize(1481, "Mar")), ( localize(1482, "Apr")), ( localize(1483, "May")), ( localize(1484, "Jun")), ( localize(1485, "Jul")), ( localize(1486, "Aug")), ( localize(1487, "Sep")), ( localize(1488, "Oct")), ( localize(1489, "Nov")), ( localize(1490, "Dec"))]; }
     resolve(variable) {
         const { name } = variable;
         if (name === 'CURRENT_YEAR') {

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

@@ -15,20 +15,20 @@ class ToggleStickyScroll extends EditorAction2 {
         super({
             id: 'editor.action.toggleStickyScroll',
             title: {
-                ...( localize2(1494, "Toggle Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1495, "&&Toggle Editor Sticky Scroll")),
+                ...( localize2(1491, "Toggle Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1492, "&&Toggle Editor Sticky Scroll")),
             },
             metadata: {
                 description: ( localize2(
-                    1496,
+                    1493,
                     "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(1497, "Sticky Scroll")),
-                mnemonicTitle: ( localize(1498, "&&Sticky Scroll")),
+                title: ( localize(1494, "Sticky Scroll")),
+                mnemonicTitle: ( localize(1495, "&&Sticky Scroll")),
             },
             menu: [
                 { id: MenuId.CommandPalette },
@@ -53,8 +53,8 @@ class FocusStickyScroll extends EditorAction2 {
         super({
             id: 'editor.action.focusStickyScroll',
             title: {
-                ...( localize2(1499, "Focus Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1500, "&&Focus Editor Sticky Scroll")),
+                ...( localize2(1496, "Focus Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1497, "&&Focus Editor Sticky Scroll")),
             },
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.has('config.editor.stickyScroll.enabled')), EditorContextKeys.stickyScrollVisible)),
             menu: [
@@ -70,7 +70,7 @@ class SelectNextStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectNextStickyScrollLine',
-            title: ( localize2(1501, "Select the next editor sticky scroll line")),
+            title: ( localize2(1498, "Select the next editor sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -86,7 +86,7 @@ class SelectPreviousStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectPreviousStickyScrollLine',
-            title: ( localize2(1502, "Select the previous sticky scroll line")),
+            title: ( localize2(1499, "Select the previous sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -102,7 +102,7 @@ class GoToStickyScrollLine extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.goToFocusedStickyScrollLine',
-            title: ( localize2(1503, "Go to the focused sticky scroll line")),
+            title: ( localize2(1500, "Go to the focused sticky scroll line")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,
@@ -118,7 +118,7 @@ class SelectEditor extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.action.selectEditor',
-            title: ( localize2(1504, "Select Editor")),
+            title: ( localize2(1501, "Select Editor")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,

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

@@ -57,6 +57,14 @@ let StickyScrollController = class StickyScrollController extends Disposable {
         this._register(this._stickyLineCandidateProvider);
         this._widgetState = StickyScrollWidgetState.Empty;
         const stickyScrollDomNode = this._stickyScrollWidget.getDomNode();
+        this._register(this._editor.onDidChangeLineHeight((e) => {
+            e.changes.forEach((change) => {
+                const lineNumber = change.lineNumber;
+                if (this._widgetState.startLineNumbers.includes(lineNumber)) {
+                    this._renderStickyScroll(lineNumber);
+                }
+            });
+        }));
         this._register(this._editor.onDidChangeConfiguration(e => {
             this._readConfigurationChange(e);
         }));

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

@@ -239,7 +239,7 @@ StickyModelFromCandidateOutlineProvider = ( __decorate([
 class StickyModelFromCandidateFoldingProvider extends StickyModelCandidateProvider {
     constructor(editor) {
         super(editor);
-        this._foldingLimitReporter = ( new RangesLimitReporter(editor));
+        this._foldingLimitReporter = this._register(( new RangesLimitReporter(editor)));
     }
     createStickyModel(token, model) {
         const foldingElement = this._fromFoldingRegions(model);

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

@@ -116,7 +116,7 @@ let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disp
             }
         }
         const lowerBound = this.updateIndex(binarySearch(childrenStartLines, range.startLineNumber, (a, b) => { return a - b; }));
-        const upperBound = this.updateIndex(binarySearch(childrenStartLines, range.startLineNumber + depth, (a, b) => { return a - b; }));
+        const upperBound = this.updateIndex(binarySearch(childrenStartLines, range.endLineNumber, (a, b) => { return a - b; }));
         for (let i = lowerBound; i <= upperBound; i++) {
             const child = outlineModel.children[i];
             if (!child) {
@@ -128,7 +128,7 @@ let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disp
                 const childEndLine = childRange.endLineNumber;
                 if (range.startLineNumber <= childEndLine + 1 && childStartLine - 1 <= range.endLineNumber && childStartLine !== lastLine) {
                     lastLine = childStartLine;
-                    const lineHeight = this._editor.getOption(EditorOption.lineHeight);
+                    const lineHeight = this._editor.getLineHeightForLineNumber(childStartLine);
                     result.push(( new StickyLineCandidate(childStartLine, childEndLine - 1, top, lineHeight)));
                     this.getCandidateStickyLinesIntersectingFromStickyModel(range, child, result, depth + 1, top + lineHeight, childStartLine);
                 }

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

@@ -45,6 +45,7 @@ export declare class StickyScrollWidget extends Disposable implements IOverlayWi
     private _useFoldingOpacityTransition;
     private _setFoldingIconsVisibility;
     private _renderRootNode;
+    private _getHeightOfLines;
     private _setHeight;
     private _setFoldingHoverListeners;
     private _renderChildNode;

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

@@ -128,7 +128,7 @@ class StickyScrollWidget extends Disposable {
         if (!state) {
             return true;
         }
-        const futureWidgetHeight = state.startLineNumbers.length * this._lineHeight + state.lastLineRelativePosition;
+        const futureWidgetHeight = this._getHeightOfLines(state.startLineNumbers, state.lastLineRelativePosition);
         if (futureWidgetHeight > 0) {
             this._lastLineRelativePosition = state.lastLineRelativePosition;
             const lineNumbers = [...state.startLineNumbers];
@@ -188,16 +188,19 @@ class StickyScrollWidget extends Disposable {
             this._setHeight(0);
             return;
         }
+        let top = 0;
         for (const stickyLine of this._renderedStickyLines) {
-            this._updatePosition(stickyLine);
+            this._updatePosition(stickyLine, top);
+            top += stickyLine.height;
         }
         const layoutInfo = this._editor.getLayoutInfo();
         const linesToRender = this._lineNumbers.slice(rebuildFromLine);
         for (const [index, line] of linesToRender.entries()) {
-            const stickyLine = this._renderChildNode(index + rebuildFromLine, line, foldingModel, layoutInfo);
+            const stickyLine = this._renderChildNode(index + rebuildFromLine, line, top, foldingModel, layoutInfo);
             if (!stickyLine) {
                 continue;
             }
+            top += stickyLine.height;
             this._linesDomNode.appendChild(stickyLine.lineDomNode);
             this._lineNumbersDomNode.appendChild(stickyLine.lineNumberDomNode);
             this._renderedStickyLines.push(stickyLine);
@@ -206,12 +209,19 @@ class StickyScrollWidget extends Disposable {
             this._setFoldingHoverListeners();
             this._useFoldingOpacityTransition(!this._isOnGlyphMargin);
         }
-        const widgetHeight = this._lineNumbers.length * this._lineHeight + this._lastLineRelativePosition;
+        const widgetHeight = top + this._lastLineRelativePosition;
         this._setHeight(widgetHeight);
         this._rootDomNode.style.marginLeft = '0px';
         this._minContentWidthInPx = Math.max(...( this._renderedStickyLines.map(l => l.scrollWidth))) + layoutInfo.verticalScrollbarWidth;
         this._editor.layoutOverlayWidget(this);
     }
+    _getHeightOfLines(lineNumbers, lastLineRelativePosition) {
+        let totalHeight = 0;
+        for (let i = 0; i < lineNumbers.length; i++) {
+            totalHeight += this._editor.getLineHeightForLineNumber(lineNumbers[i]);
+        }
+        return totalHeight + lastLineRelativePosition;
+    }
     _setHeight(height) {
         if (this._height === height) {
             return;
@@ -243,7 +253,7 @@ class StickyScrollWidget extends Disposable {
             this._setFoldingIconsVisibility(false);
         }));
     }
-    _renderChildNode(index, line, foldingModel, layoutInfo) {
+    _renderChildNode(index, line, top, foldingModel, layoutInfo) {
         const viewModel = this._editor._getViewModel();
         if (!viewModel) {
             return;
@@ -258,7 +268,7 @@ class StickyScrollWidget extends Disposable {
         catch (err) {
             actualInlineDecorations = [];
         }
-        const lineHeight = this._lineHeight;
+        const lineHeight = this._editor.getLineHeightForLineNumber(line);
         const renderLineInput = ( new RenderLineInput(
             true,
             true,
@@ -320,6 +330,7 @@ class StickyScrollWidget extends Disposable {
         if (foldingIcon) {
             lineNumberHTMLNode.appendChild(foldingIcon.domNode);
             foldingIcon.domNode.style.left = `${layoutInfo.lineNumbersWidth + layoutInfo.lineNumbersLeft}px`;
+            foldingIcon.domNode.style.lineHeight = `${lineHeight}px`;
         }
         this._editor.applyFontInfo(lineHTMLNode);
         this._editor.applyFontInfo(lineNumberHTMLNode);
@@ -337,9 +348,9 @@ class StickyScrollWidget extends Disposable {
             lineHTMLNode.scrollWidth,
             lineHeight
         ));
-        return this._updatePosition(renderedLine);
+        return this._updatePosition(renderedLine, top);
     }
-    _updatePosition(stickyLine) {
+    _updatePosition(stickyLine, top) {
         const index = stickyLine.index;
         const lineHTMLNode = stickyLine.lineDomNode;
         const lineNumberHTMLNode = stickyLine.lineNumberDomNode;
@@ -348,17 +359,16 @@ class StickyScrollWidget extends Disposable {
             const zIndex = '0';
             lineHTMLNode.style.zIndex = zIndex;
             lineNumberHTMLNode.style.zIndex = zIndex;
-            const top = `${index * this._lineHeight + this._lastLineRelativePosition + (stickyLine.foldingIcon?.isCollapsed ? 1 : 0)}px`;
-            lineHTMLNode.style.top = top;
-            lineNumberHTMLNode.style.top = top;
+            const updatedTop = `${top + this._lastLineRelativePosition + (stickyLine.foldingIcon?.isCollapsed ? 1 : 0)}px`;
+            lineHTMLNode.style.top = updatedTop;
+            lineNumberHTMLNode.style.top = updatedTop;
         }
         else {
             const zIndex = '1';
             lineHTMLNode.style.zIndex = zIndex;
             lineNumberHTMLNode.style.zIndex = zIndex;
-            const top = `${index * this._lineHeight}px`;
-            lineHTMLNode.style.top = top;
-            lineNumberHTMLNode.style.top = top;
+            lineHTMLNode.style.top = `${top}px`;
+            lineNumberHTMLNode.style.top = `${top}px`;
         }
         return stickyLine;
     }

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(1505, "Whether any suggestion is focused")))),
-    DetailsVisible: ( new RawContextKey('suggestWidgetDetailsVisible', false, ( localize(1506, "Whether suggestion details are visible")))),
-    MultipleSuggestions: ( new RawContextKey('suggestWidgetMultipleSuggestions', false, ( localize(1507, "Whether there are multiple suggestions to pick from")))),
+    HasFocusedSuggestion: ( new RawContextKey('suggestWidgetHasFocusedSuggestion', false, ( localize(1502, "Whether any suggestion is focused")))),
+    DetailsVisible: ( new RawContextKey('suggestWidgetDetailsVisible', false, ( localize(1503, "Whether suggestion details are visible")))),
+    MultipleSuggestions: ( new RawContextKey('suggestWidgetMultipleSuggestions', false, ( localize(1504, "Whether there are multiple suggestions to pick from")))),
     MakesTextEdit: ( new RawContextKey('suggestionMakesTextEdit', true, ( localize(
-        1508,
+        1505,
         "Whether inserting the current suggestion yields in a change or has everything already been typed"
     )))),
-    AcceptSuggestionsOnEnter: ( new RawContextKey('acceptSuggestionOnEnter', true, ( localize(1509, "Whether suggestions are inserted when pressing Enter")))),
-    HasInsertAndReplaceRange: ( new RawContextKey('suggestionHasInsertAndReplaceRange', false, ( localize(1510, "Whether the current suggestion has insert and replace behaviour")))),
+    AcceptSuggestionsOnEnter: ( new RawContextKey('acceptSuggestionOnEnter', true, ( localize(1506, "Whether suggestions are inserted when pressing Enter")))),
+    HasInsertAndReplaceRange: ( new RawContextKey('suggestionHasInsertAndReplaceRange', false, ( localize(1507, "Whether the current suggestion has insert and replace behaviour")))),
     InsertMode: ( new RawContextKey(
         'suggestionInsertMode',
         undefined,
-        { type: 'string', description: ( localize(1511, "Whether the default behaviour is to insert or replace")) }
+        { type: 'string', description: ( localize(1508, "Whether the default behaviour is to insert or replace")) }
     )),
-    CanResolve: ( new RawContextKey('suggestionCanResolve', false, ( localize(1512, "Whether the current suggestion supports to resolve further details")))),
+    CanResolve: ( new RawContextKey('suggestionCanResolve', false, ( localize(1509, "Whether the current suggestion supports to resolve further details")))),
 };
 const suggestWidgetStatusbarMenu = ( new MenuId('suggestWidgetStatusBar'));
 class CompletionItem {