Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Render both debug frame indicator and breakpoint #180448

Merged
merged 1 commit into from
Apr 20, 2023

Conversation

joyceerhl
Copy link
Contributor

Fixes #180439

@joyceerhl joyceerhl enabled auto-merge (squash) April 20, 2023 22:11
@joyceerhl joyceerhl self-assigned this Apr 20, 2023
@vscodenpa vscodenpa added this to the April 2023 milestone Apr 20, 2023
@@ -29,6 +29,8 @@ const stickiness = TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges;
const TOP_STACK_FRAME_MARGIN: IModelDecorationOptions = {
description: 'top-stack-frame-margin',
glyphMarginClassName: ThemeIcon.asClassName(debugStackframe),
glyphMargin: { position: GlyphMarginLane.Right },
zIndex: 9999,
Copy link
Contributor Author

@joyceerhl joyceerhl Apr 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The glyph margin and editor don't know anything about debug decorations vs non-debug decorations--all they know about is the specified zIndex and position. To ensure that the debug frame indicator continues to render together with the breakpoint decoration, we need both options to match the breakpoint decorations options, which is where these values come from:

return {
description: 'breakpoint-decoration',
glyphMargin: { position: GlyphMarginLane.Right },
glyphMarginClassName: ThemeIcon.asClassName(icon),
glyphMarginHoverMessage,
stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
before: renderInline ? {
content: noBreakWhitespace,
inlineClassName: `debug-breakpoint-placeholder`,
inlineClassNameAffectsLetterSpacing: true
} : undefined,
overviewRuler: overviewRulerDecoration,
zIndex: 9999
};

@joyceerhl joyceerhl merged commit 2c10a8e into main Apr 20, 2023
@joyceerhl joyceerhl deleted the dev/joyceerhl/characteristic-raven branch April 20, 2023 22:35
@github-actions github-actions bot locked and limited conversation to collaborators Jun 4, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Debug frame indicator should go in the same decoration column as breakpoints
3 participants