Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-26 18:27:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adopts injected text for breakpoint space decoration.

Browse Source
This commit is contained in:
Henning Dieterichs
2021-11-08 14:00:00 +01:00
parent 89862489b1
commit 13438fb09f
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
+13 -3
View File
@@ -73,6 +73,8 @@ export function createBreakpointDecorations(model: ITextModel, breakpoints: Read
return result;
}
const noBreakWhitespace = '\xa0';
function getBreakpointDecorationOptions(model: ITextModel, breakpoint: IBreakpoint, state: State, breakpointsActivated: boolean, showBreakpointsInOverviewRuler: boolean): IModelDecorationOptions {
const { icon, message } = getBreakpointMessageAndIcon(state, breakpointsActivated, breakpoint, undefined);
let glyphMarginHoverMessage: MarkdownString | undefined;
@@ -100,7 +102,11 @@ function getBreakpointDecorationOptions(model: ITextModel, breakpoint: IBreakpoi
glyphMarginClassName: ThemeIcon.asClassName(icon),
glyphMarginHoverMessage,
stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
beforeContentClassName: renderInline ? `debug-breakpoint-placeholder` : undefined,
before: renderInline ? {
content: noBreakWhitespace,
inlineClassName: `debug-breakpoint-placeholder`,
inlineClassNameAffectsLetterSpacing: true
} : undefined,
overviewRuler: overviewRulerDecoration
};
}
@@ -133,7 +139,11 @@ async function createCandidateDecorations(model: ITextModel, breakpointDecoratio
options: {
description: 'breakpoint-placeholder-decoration',
stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
beforeContentClassName: breakpointAtPosition ? undefined : `debug-breakpoint-placeholder`
before: breakpointAtPosition ? undefined : {
content: noBreakWhitespace,
inlineClassName: `debug-breakpoint-placeholder`,
inlineClassNameAffectsLetterSpacing: true
},
},
breakpoint: breakpointAtPosition ? breakpointAtPosition.breakpoint : undefined
});
@@ -466,7 +476,7 @@ export class BreakpointEditorContribution implements IBreakpointEditorContributi
this.breakpointDecorations = decorationIds.map((decorationId, index) => {
let inlineWidget: InlineBreakpointWidget | undefined = undefined;
const breakpoint = breakpoints[index];
if (desiredBreakpointDecorations[index].options.beforeContentClassName) {
if (desiredBreakpointDecorations[index].options.before) {
const contextMenuActions = () => this.getContextMenuActions([breakpoint], activeCodeEditor.getModel().uri, breakpoint.lineNumber, breakpoint.column);
inlineWidget = new InlineBreakpointWidget(activeCodeEditor, decorationId, desiredBreakpointDecorations[index].options.glyphMarginClassName, breakpoint, this.debugService, this.contextMenuService, contextMenuActions);
}
src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
+7 -1
View File
@@ -30,7 +30,13 @@
left: -8px !important;
}
.monaco-editor .debug-breakpoint-placeholder::before,
.monaco-editor .debug-breakpoint-placeholder {
width: 0.9em;
display: inline-flex;
vertical-align: middle;
margin-top: -1px;
}
.monaco-editor .debug-top-stack-frame-column::before {
content: ' ';
width: 0.9em;
src/vs/workbench/contrib/debug/test/browser/breakpoints.test.ts
+1 -1
View File
@@ -358,7 +358,7 @@ suite('Debug - Breakpoints', () => {
assert.deepStrictEqual(decorations[1].range, new Range(2, 4, 2, 5));
assert.deepStrictEqual(decorations[2].range, new Range(3, 5, 3, 6));
assert.strictEqual(decorations[0].options.beforeContentClassName, undefined);
assert.strictEqual(decorations[1].options.beforeContentClassName, `debug-breakpoint-placeholder`);
assert.strictEqual(decorations[1].options.before?.inlineClassName, `debug-breakpoint-placeholder`);
assert.strictEqual(decorations[0].options.overviewRuler?.position, OverviewRulerLane.Left);
const expected = new MarkdownString().appendCodeblock(languageId, 'Expression condition: x > 5');
assert.deepStrictEqual(decorations[0].options.glyphMarginHoverMessage, expected);