@codingame/monaco-vscode-api 15.0.3 → 16.0.0

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

@@ -0,0 +1,42 @@
+.monaco-editor .rename-box {
+	z-index: 100;
+	color: inherit;
+	border-radius: 4px;
+}
+.monaco-editor .rename-box.preview {
+	padding: 4px 4px 0 4px;
+}
+.monaco-editor .rename-box .rename-input-with-button {
+	padding: 3px;
+	border-radius: 2px;
+	width: calc(100% - 8px);
+}
+.monaco-editor .rename-box .rename-input {
+	width: calc(100% - 8px);
+	padding: 0;
+}
+.monaco-editor .rename-box .rename-input:focus {
+	outline: none;
+}
+.monaco-editor .rename-box .rename-suggestions-button {
+	display: flex;
+	align-items: center;
+	padding: 3px;
+	background-color: transparent;
+	border: none;
+	border-radius: 5px;
+	cursor: pointer;
+}
+.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;
+}

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

@@ -15,7 +15,7 @@ import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { assertType, isDefined } from '../../../../base/common/types.js';
-import './renameWidget.css.js';
+import './renameWidget.css';
 import { applyFontInfo } from '../../../browser/config/domFontInfo.js';
 import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
@@ -42,7 +42,7 @@ import { quickInputListFocusBackground, quickInputListFocusForeground } from '..
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 
-const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey('renameInputVisible', false, ( localize(1412, "Whether the rename input widget is visible"))));
+const CONTEXT_RENAME_INPUT_VISIBLE = ( new RawContextKey('renameInputVisible', false, ( localize(1442, "Whether the rename input widget is visible"))));
 let RenameWidget = class RenameWidget {
     constructor(_editor, _acceptKeybindings, _themeService, _keybindingService, contextKeyService, _logService) {
         this._editor = _editor;
@@ -66,7 +66,7 @@ let RenameWidget = class RenameWidget {
                 this._updateFont();
             }
         }));
-        this._disposables.add(_themeService.onDidColorThemeChange(e => this._updateStyles(e.theme)));
+        this._disposables.add(_themeService.onDidColorThemeChange(this._updateStyles, this));
     }
     dispose() {
         this._disposables.dispose();
@@ -165,7 +165,7 @@ let RenameWidget = class RenameWidget {
     beforeRender() {
         const [accept, preview] = this._acceptKeybindings;
         this._label.innerText = ( localize(
-            1413,
+            1443,
             "{0} to Rename, {1} to Preview",
             this._keybindingService.lookupKeybinding(accept)?.getLabel(),
             this._keybindingService.lookupKeybinding(preview)?.getLabel()
@@ -461,7 +461,7 @@ class RenameCandidateListView {
         this._listWidget.layout(height, width);
         this._listContainer.style.height = `${height}px`;
         this._listContainer.style.width = `${width}px`;
-        status(( localize(1414, "Received {0} rename suggestions", candidates.length)));
+        status(( localize(1444, "Received {0} rename suggestions", candidates.length)));
     }
     clearCandidates() {
         this._listContainer.style.height = '0px';
@@ -600,13 +600,13 @@ class InputWithButton {
             this._inputNode.className = 'rename-input';
             this._inputNode.type = 'text';
             this._inputNode.style.border = 'none';
-            this._inputNode.setAttribute('aria-label', ( localize(1415, "Rename input. Type new name and press Enter to commit.")));
+            this._inputNode.setAttribute('aria-label', ( localize(1445, "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(1416, "Generate new name suggestions"));
-            this._buttonCancelHoverText = ( localize(1417, "Cancel"));
+            this._buttonGenHoverText = ( localize(1446, "Generate new name suggestions"));
+            this._buttonCancelHoverText = ( localize(1447, "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(1418, "Expand Selection")),
+            label: ( localize2(1448, "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(1419, "&&Expand Selection")),
+                title: ( localize(1449, "&&Expand Selection")),
                 order: 2
             }
         });
@@ -143,7 +143,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
     constructor() {
         super(false, {
             id: 'editor.action.smartSelect.shrink',
-            label: ( localize2(1420, "Shrink Selection")),
+            label: ( localize2(1450, "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(1421, "&&Shrink Selection")),
+                title: ( localize(1451, "&&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(1422, "Whether the editor in current in snippet mode")))); }
-    static { this.HasNextTabstop = ( new RawContextKey('hasNextTabstop', false, ( localize(1423, "Whether there is a next tab stop when in snippet mode")))); }
-    static { this.HasPrevTabstop = ( new RawContextKey('hasPrevTabstop', false, ( localize(1424, "Whether there is a previous tab stop when in snippet mode")))); }
+    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")))); }
     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(1425, 'Go to next placeholder...')) }
+                            command: { id: 'jumpToNextSnippetPlaceholder', title: ( localize(1455, 'Go to next placeholder...')) }
                         });
                     }
                     return { suggestions };

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

@@ -0,0 +1,13 @@
+.monaco-editor .snippet-placeholder {
+	min-width: 2px;
+	outline-style: solid;
+	outline-width: 1px;
+	background-color: var(--vscode-editor-snippetTabstopHighlightBackground, transparent);
+	outline-color: var(--vscode-editor-snippetTabstopHighlightBorder, transparent);
+}
+.monaco-editor .finish-snippet-placeholder {
+	outline-style: solid;
+	outline-width: 1px;
+	background-color: var(--vscode-editor-snippetFinalTabstopHighlightBackground, transparent);
+	outline-color: var(--vscode-editor-snippetFinalTabstopHighlightBorder, transparent);
+}

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

@@ -4,7 +4,7 @@ import { groupBy } from '../../../../base/common/arrays.js';
 import { CharCode } from '../../../../base/common/charCode.js';
 import { dispose } from '../../../../base/common/lifecycle.js';
 import { getLeadingWhitespace } from '../../../../base/common/strings.js';
-import './snippetSession.css.js';
+import './snippetSession.css';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
 import { Range } from '../../../common/core/range.js';

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(1426, "Sunday")), ( localize(1427, "Monday")), ( localize(1428, "Tuesday")), ( localize(1429, "Wednesday")), ( localize(1430, "Thursday")), ( localize(1431, "Friday")), ( localize(1432, "Saturday"))]; }
-    static { this.dayNamesShort = [( localize(1433, "Sun")), ( localize(1434, "Mon")), ( localize(1435, "Tue")), ( localize(1436, "Wed")), ( localize(1437, "Thu")), ( localize(1438, "Fri")), ( localize(1439, "Sat"))]; }
-    static { this.monthNames = [( localize(1440, "January")), ( localize(1441, "February")), ( localize(1442, "March")), ( localize(1443, "April")), ( localize(1444, "May")), ( localize(1445, "June")), ( localize(1446, "July")), ( localize(1447, "August")), ( localize(1448, "September")), ( localize(1449, "October")), ( localize(1450, "November")), ( localize(1451, "December"))]; }
-    static { this.monthNamesShort = [( localize(1452, "Jan")), ( localize(1453, "Feb")), ( localize(1454, "Mar")), ( localize(1455, "Apr")), ( localize(1456, "May")), ( localize(1457, "Jun")), ( localize(1458, "Jul")), ( localize(1459, "Aug")), ( localize(1460, "Sep")), ( localize(1461, "Oct")), ( localize(1462, "Nov")), ( localize(1463, "Dec"))]; }
+    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"))]; }
     resolve(variable) {
         const { name } = variable;
         if (name === 'CURRENT_YEAR') {

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

@@ -0,0 +1,58 @@
+.monaco-editor .sticky-widget {
+	overflow: hidden;
+}
+.monaco-editor .sticky-widget-line-numbers {
+	float: left;
+	background-color: inherit;
+}
+.monaco-editor .sticky-widget-lines-scrollable {
+	display: inline-block;
+	position: absolute;
+	overflow: hidden;
+	width: var(--vscode-editorStickyScroll-scrollableWidth);
+	background-color: inherit;
+}
+.monaco-editor .sticky-widget-lines {
+	position: absolute;
+	background-color: inherit;
+}
+.monaco-editor .sticky-line-number, .monaco-editor .sticky-line-content {
+	color: var(--vscode-editorLineNumber-foreground);
+	white-space: nowrap;
+	display: inline-block;
+	position: absolute;
+	background-color: inherit;
+}
+.monaco-editor .sticky-line-number .codicon-folding-expanded,
+.monaco-editor .sticky-line-number .codicon-folding-collapsed {
+	float: right;
+	transition: var(--vscode-editorStickyScroll-foldingOpacityTransition);
+	position: absolute;
+	margin-left: 2px;
+}
+.monaco-editor .sticky-line-content {
+	width: var(--vscode-editorStickyScroll-scrollableWidth);
+	background-color: inherit;
+	white-space: nowrap;
+}
+.monaco-editor .sticky-line-number-inner {
+	display: inline-block;
+	text-align: right;
+}
+.monaco-editor .sticky-widget {
+	border-bottom: 1px solid var(--vscode-editorStickyScroll-border);
+}
+.monaco-editor .sticky-line-content:hover {
+	background-color: var(--vscode-editorStickyScrollHover-background);
+	cursor: pointer;
+}
+.monaco-editor .sticky-widget {
+	width: 100%;
+	box-shadow: var(--vscode-editorStickyScroll-shadow) 0 4px 2px -2px;
+	z-index: 4;
+	background-color: var(--vscode-editorStickyScroll-background);
+	right: initial !important;
+}
+.monaco-editor .sticky-widget.peek {
+	background-color: var(--vscode-peekViewEditorStickyScroll-background);
+}

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(1464, "Toggle Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1465, "&&Toggle Editor Sticky Scroll")),
+                ...( localize2(1494, "Toggle Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1495, "&&Toggle Editor Sticky Scroll")),
             },
             metadata: {
                 description: ( localize2(
-                    1466,
+                    1496,
                     "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(1467, "Sticky Scroll")),
-                mnemonicTitle: ( localize(1468, "&&Sticky Scroll")),
+                title: ( localize(1497, "Sticky Scroll")),
+                mnemonicTitle: ( localize(1498, "&&Sticky Scroll")),
             },
             menu: [
                 { id: MenuId.CommandPalette },
@@ -53,8 +53,8 @@ class FocusStickyScroll extends EditorAction2 {
         super({
             id: 'editor.action.focusStickyScroll',
             title: {
-                ...( localize2(1469, "Focus Editor Sticky Scroll")),
-                mnemonicTitle: ( localize(1470, "&&Focus Editor Sticky Scroll")),
+                ...( localize2(1499, "Focus Editor Sticky Scroll")),
+                mnemonicTitle: ( localize(1500, "&&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(1471, "Select the next editor sticky scroll line")),
+            title: ( localize2(1501, "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(1472, "Select the previous sticky scroll line")),
+            title: ( localize2(1502, "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(1473, "Go to the focused sticky scroll line")),
+            title: ( localize2(1503, "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(1474, "Select Editor")),
+            title: ( localize2(1504, "Select Editor")),
             precondition: ( EditorContextKeys.stickyScrollFocused.isEqualTo(true)),
             keybinding: {
                 weight,

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

@@ -489,7 +489,10 @@ let StickyScrollController = class StickyScrollController extends Disposable {
         this._stickyScrollWidget.setState(undefined, undefined);
     }
     findScrollWidgetState() {
-        const lineHeight = this._editor.getOption(EditorOption.lineHeight);
+        if (!this._editor.hasModel()) {
+            return StickyScrollWidgetState.Empty;
+        }
+        const textModel = this._editor.getModel();
         const maxNumberStickyLines = Math.min(this._maxStickyLines, this._editor.getOption(EditorOption.stickyScroll).maxLineCount);
         const scrollTop = this._editor.getScrollTop();
         let lastLineRelativePosition = 0;
@@ -505,24 +508,18 @@ let StickyScrollController = class StickyScrollController extends Disposable {
             for (const range of candidateRanges) {
                 const start = range.startLineNumber;
                 const end = range.endLineNumber;
-                const depth = range.nestingDepth;
-                if (end - start > 0) {
-                    const topOfElementAtDepth = (depth - 1) * lineHeight;
-                    const bottomOfElementAtDepth = depth * lineHeight;
-                    const bottomOfBeginningLine = this._editor.getBottomForLineNumber(start) - scrollTop;
-                    const topOfEndLine = this._editor.getTopForLineNumber(end) - scrollTop;
+                const isValidRange = textModel.isValidRange({ startLineNumber: start, endLineNumber: end, startColumn: 1, endColumn: 1 });
+                if (isValidRange && end - start > 0) {
+                    const topOfElement = range.top;
+                    const bottomOfElement = topOfElement + range.height;
+                    const topOfBeginningLine = this._editor.getTopForLineNumber(start) - scrollTop;
                     const bottomOfEndLine = this._editor.getBottomForLineNumber(end) - scrollTop;
-                    if (topOfElementAtDepth > topOfEndLine && topOfElementAtDepth <= bottomOfEndLine) {
+                    if (topOfElement > topOfBeginningLine && topOfElement <= bottomOfEndLine) {
                         startLineNumbers.push(start);
                         endLineNumbers.push(end + 1);
-                        if (topOfElementAtDepth > bottomOfEndLine - lineHeight) {
-                            lastLineRelativePosition = bottomOfEndLine - bottomOfElementAtDepth;
+                        if (bottomOfElement > bottomOfEndLine) {
+                            lastLineRelativePosition = bottomOfEndLine - bottomOfElement;
                         }
-                        break;
-                    }
-                    else if (bottomOfElementAtDepth > bottomOfBeginningLine && bottomOfElementAtDepth <= bottomOfEndLine) {
-                        startLineNumbers.push(start);
-                        endLineNumbers.push(end + 1);
                     }
                     if (startLineNumbers.length === maxNumberStickyLines) {
                         break;

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

@@ -7,8 +7,9 @@ import { StickyElement, StickyRange } from "./stickyScrollElement.js";
 export declare class StickyLineCandidate {
     readonly startLineNumber: number;
     readonly endLineNumber: number;
-    readonly nestingDepth: number;
-    constructor(startLineNumber: number, endLineNumber: number, nestingDepth: number);
+    readonly top: number;
+    readonly height: number;
+    constructor(startLineNumber: number, endLineNumber: number, top: number, height: number);
 }
 export interface IStickyLineCandidateProvider {
     dispose(): void;
@@ -36,6 +37,6 @@ export declare class StickyLineCandidateProvider extends Disposable implements I
     update(): Promise<void>;
     private updateStickyModel;
     private updateIndex;
-    getCandidateStickyLinesIntersectingFromStickyModel(range: StickyRange, outlineModel: StickyElement, result: StickyLineCandidate[], depth: number, lastStartLineNumber: number): void;
+    getCandidateStickyLinesIntersectingFromStickyModel(range: StickyRange, outlineModel: StickyElement, result: StickyLineCandidate[], depth: number, top: number, lastStartLineNumber: number): void;
     getCandidateStickyLinesIntersecting(range: StickyRange): StickyLineCandidate[];
 }

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

@@ -11,10 +11,11 @@ import { ILanguageConfigurationService } from '../../../common/languages/languag
 import { StickyModelProvider } from './stickyScrollModelProvider.js';
 
 class StickyLineCandidate {
-    constructor(startLineNumber, endLineNumber, nestingDepth) {
+    constructor(startLineNumber, endLineNumber, top, height) {
         this.startLineNumber = startLineNumber;
         this.endLineNumber = endLineNumber;
-        this.nestingDepth = nestingDepth;
+        this.top = top;
+        this.height = height;
     }
 }
 let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disposable {
@@ -102,7 +103,7 @@ let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disp
         }
         return index;
     }
-    getCandidateStickyLinesIntersectingFromStickyModel(range, outlineModel, result, depth, lastStartLineNumber) {
+    getCandidateStickyLinesIntersectingFromStickyModel(range, outlineModel, result, depth, top, lastStartLineNumber) {
         if (outlineModel.children.length === 0) {
             return;
         }
@@ -121,17 +122,19 @@ let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disp
             if (!child) {
                 return;
             }
-            if (child.range) {
-                const childStartLine = child.range.startLineNumber;
-                const childEndLine = child.range.endLineNumber;
+            const childRange = child.range;
+            if (childRange) {
+                const childStartLine = childRange.startLineNumber;
+                const childEndLine = childRange.endLineNumber;
                 if (range.startLineNumber <= childEndLine + 1 && childStartLine - 1 <= range.endLineNumber && childStartLine !== lastLine) {
                     lastLine = childStartLine;
-                    result.push(( new StickyLineCandidate(childStartLine, childEndLine - 1, depth + 1)));
-                    this.getCandidateStickyLinesIntersectingFromStickyModel(range, child, result, depth + 1, childStartLine);
+                    const lineHeight = this._editor.getOption(EditorOption.lineHeight);
+                    result.push(( new StickyLineCandidate(childStartLine, childEndLine - 1, top, lineHeight)));
+                    this.getCandidateStickyLinesIntersectingFromStickyModel(range, child, result, depth + 1, top + lineHeight, childStartLine);
                 }
             }
             else {
-                this.getCandidateStickyLinesIntersectingFromStickyModel(range, child, result, depth, lastStartLineNumber);
+                this.getCandidateStickyLinesIntersectingFromStickyModel(range, child, result, depth, top, lastStartLineNumber);
             }
         }
     }
@@ -140,7 +143,7 @@ let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disp
             return [];
         }
         let stickyLineCandidates = [];
-        this.getCandidateStickyLinesIntersectingFromStickyModel(range, this._model.element, stickyLineCandidates, 0, -1);
+        this.getCandidateStickyLinesIntersectingFromStickyModel(range, this._model.element, stickyLineCandidates, 0, 0, -1);
         const hiddenRanges = this._editor._getViewModel()?.getHiddenAreas();
         if (hiddenRanges) {
             for (const hiddenRange of hiddenRanges) {

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

@@ -13,12 +13,12 @@ export declare class StickyScrollWidgetState {
     static get Empty(): StickyScrollWidgetState;
 }
 export declare class StickyScrollWidget extends Disposable implements IOverlayWidget {
-    private readonly _editor;
     private readonly _foldingIconStore;
     private readonly _rootDomNode;
     private readonly _lineNumbersDomNode;
     private readonly _linesDomNodeScrollable;
     private readonly _linesDomNode;
+    private readonly _editor;
     private _previousState;
     private _lineHeight;
     private _renderedStickyLines;
@@ -32,7 +32,7 @@ export declare class StickyScrollWidget extends Disposable implements IOverlayWi
     readonly onDidChangeStickyScrollHeight: import("../../../../base/common/event.js").Event<{
         height: number;
     }>;
-    constructor(_editor: ICodeEditor);
+    constructor(editor: ICodeEditor);
     get lineNumbers(): number[];
     get lineNumberCount(): number;
     getRenderedStickyLine(lineNumber: number): RenderedStickyLine | undefined;
@@ -48,7 +48,7 @@ export declare class StickyScrollWidget extends Disposable implements IOverlayWi
     private _setHeight;
     private _setFoldingHoverListeners;
     private _renderChildNode;
-    private _updateTopAndZIndexOfStickyLine;
+    private _updatePosition;
     private _renderFoldingIconForLine;
     getId(): string;
     getDomNode(): HTMLElement;
@@ -71,7 +71,8 @@ declare class RenderedStickyLine {
     readonly foldingIcon: StickyFoldingIcon | undefined;
     readonly characterMapping: CharacterMapping;
     readonly scrollWidth: number;
-    constructor(index: number, lineNumber: number, lineDomNode: HTMLElement, lineNumberDomNode: HTMLElement, foldingIcon: StickyFoldingIcon | undefined, characterMapping: CharacterMapping, scrollWidth: number);
+    readonly height: number;
+    constructor(index: number, lineNumber: number, lineDomNode: HTMLElement, lineNumberDomNode: HTMLElement, foldingIcon: StickyFoldingIcon | undefined, characterMapping: CharacterMapping, scrollWidth: number, height: number);
 }
 declare class StickyFoldingIcon {
     isCollapsed: boolean;