From 2c68e07691540a2e57da41ed69c36d07a81765cc Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Wed, 29 Mar 2023 14:45:42 -0700 Subject: [PATCH] debug: show first line placeholder if other breakpoints are online (#178624) Got lost in a merge conflict resolution --- .../contrib/debug/browser/breakpointEditorContribution.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts index aa7ab768580..08e51da9c74 100644 --- a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts +++ b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts @@ -173,8 +173,8 @@ function createCandidateDecorations(model: ITextModel, breakpointDecorations: IB const lastColumn = model.getLineLastNonWhitespaceColumn(lineNumber); positions.forEach(p => { const range = new Range(p.lineNumber, p.column, p.lineNumber, p.column + 1); - if (p.column <= firstColumn || p.column > lastColumn) { - // Do not render candidates on the start of the line. + if ((p.column <= firstColumn && !breakpointDecorations.some(bp => bp.range.startColumn > firstColumn && bp.range.startLineNumber === p.lineNumber)) || p.column > lastColumn) { + // Do not render candidates on the start of the line if there's no other breakpoint on the line. return; }