Skip to content

Commit 1085eb3

Browse files
authored
Fix gutter indicator direction on first line (microsoft#249006)
gutter indicator shows in wrong direction when on first line
1 parent 8e36368 commit 1085eb3

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ export class InlineEditsGutterIndicator extends Disposable {
197197
const gutterWidthWithoutPadding = layout.decorationsLeft + layout.decorationsWidth - layout.glyphMarginLeft - 2 * gutterViewPortPadding;
198198
const gutterHeightWithoutPadding = layout.height - 2 * gutterViewPortPadding;
199199
const gutterViewPortWithStickyScroll = Rect.fromLeftTopWidthHeight(gutterViewPortPadding, gutterViewPortPadding, gutterWidthWithoutPadding, gutterHeightWithoutPadding);
200-
const gutterViewPortWithoutStickyScroll = gutterViewPortWithStickyScroll.withTop(this._stickyScrollHeight.read(reader) + gutterViewPortPadding);
200+
const gutterViewPortWithoutStickyScrollWithoutPaddingTop = gutterViewPortWithStickyScroll.withTop(this._stickyScrollHeight.read(reader));
201+
const gutterViewPortWithoutStickyScroll = gutterViewPortWithStickyScroll.withTop(gutterViewPortWithoutStickyScrollWithoutPaddingTop.top + gutterViewPortPadding);
201202

202203
// The glyph margin area across all relevant lines
203204
const verticalEditRange = s.lineOffsetRange.read(reader);
@@ -207,7 +208,7 @@ export class InlineEditsGutterIndicator extends Disposable {
207208
const pillHeight = lineHeight;
208209
const pillOffset = this._verticalOffset.read(reader);
209210
const pillFullyDockedRect = gutterEditArea.withHeight(pillHeight).translateY(pillOffset);
210-
const pillIsFullyDocked = gutterViewPortWithoutStickyScroll.containsRect(pillFullyDockedRect);
211+
const pillIsFullyDocked = gutterViewPortWithoutStickyScrollWithoutPaddingTop.containsRect(pillFullyDockedRect);
211212

212213
// The icon which will be rendered in the pill
213214
const iconNoneDocked = this._tabAction.map(action => action === InlineEditTabAction.Accept ? Codicon.keyboardTab : Codicon.arrowRight);

0 commit comments

Comments
 (0)