fixes microsoft#85148

isidorn · isidorn · commit d386b49dee62 · 2019-12-06T12:27:31.000+01:00
diff --git a/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css b/src/vs/base/browser/ui/codiconLabel/codicon/codicon.css
@@ -396,7 +396,6 @@
 .codicon-debug-breakpoint-function:before { content: "\eb88" }
 .codicon-debug-breakpoint-function-disabled:before { content: "\eb88" }
 .codicon-debug-breakpoint-stackframe-active:before { content: "\eb89" }
-.codicon-debug-breakpoint-stackframe-dot:before { content: "\eb8a" }
 .codicon-debug-breakpoint-stackframe:before { content: "\eb8b" }
 .codicon-debug-breakpoint-stackframe-focused:before { content: "\eb8b" }
 .codicon-debug-breakpoint-unsupported:before { content: "\eb8c" }
diff --git a/src/vs/workbench/contrib/debug/browser/breakpointsView.ts b/src/vs/workbench/contrib/debug/browser/breakpointsView.ts
@@ -713,25 +713,6 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br
 		};
 	}
 
-	const focusedThread = debugService.getViewModel().focusedThread;
-	if (focusedThread) {
-		const callStack = focusedThread ? focusedThread.getCallStack() : undefined;
-		const topStackFrame = callStack ? callStack[0] : undefined;
-		if (topStackFrame && topStackFrame.source.uri.toString() === breakpoint.uri.toString() && topStackFrame.range.startLineNumber === breakpoint.lineNumber) {
-			if (topStackFrame.range.startColumn === breakpoint.column) {
-				return {
-					className: 'codicon-debug-breakpoint-stackframe-dot',
-					message: breakpoint.message || nls.localize('breakpoint', "Breakpoint")
-				};
-			} else if (breakpoint.column === undefined) {
-				return {
-					className: 'codicon-debug-breakpoint',
-					message: breakpoint.message || nls.localize('breakpoint', "Breakpoint")
-				};
-			}
-		}
-	}
-
 	return {
 		className: 'codicon-debug-breakpoint',
 		message: breakpoint.message || nls.localize('breakpoint', "Breakpoint")
diff --git a/src/vs/workbench/contrib/debug/browser/debugCallStackContribution.ts b/src/vs/workbench/contrib/debug/browser/debugCallStackContribution.ts
@@ -187,8 +187,8 @@ registerThemingParticipant((theme, collector) => {
 		.monaco-workbench .codicon-debug-breakpoint-data,
 		.monaco-workbench .codicon-debug-breakpoint-unsupported,
 		.monaco-workbench .codicon-debug-hint:not([class*='codicon-debug-breakpoint']),
-		.monaco-workbench .codicon-debug-breakpoint-stackframe-dot,
-		.monaco-workbench .codicon-debug-breakpoint.codicon-debug-breakpoint-stackframe-focused::after {
+		.monaco-workbench .codicon-debug-breakpoint.codicon-debug-breakpoint-stackframe-focused::after,
+		.monaco-workbench .codicon-debug-breakpoint.codicon-debug-breakpoint-stackframe::after {
 			color: ${debugIconBreakpointColor} !important;
 		}
 		`);
@@ -215,8 +215,7 @@ registerThemingParticipant((theme, collector) => {
 	const debugIconBreakpointCurrentStackframeForegroundColor = theme.getColor(debugIconBreakpointCurrentStackframeForeground);
 	if (debugIconBreakpointCurrentStackframeForegroundColor) {
 		collector.addRule(`
-		.monaco-workbench .codicon-debug-breakpoint-stackframe,
-		.monaco-workbench .codicon-debug-breakpoint-stackframe-dot::after {
+		.monaco-workbench .codicon-debug-breakpoint-stackframe {
 			color: ${debugIconBreakpointCurrentStackframeForegroundColor} !important;
 		}
 		`);
diff --git a/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css b/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
@@ -16,26 +16,10 @@
 	align-items: center;
 }
 
-/* overlapped icons */
-.inline-breakpoint-widget.codicon-debug-breakpoint-stackframe-dot::after {
-	position: absolute;
-	top: 0;
-	left: 0;
-	bottom: 0;
-	margin: auto;
-	display: table;
-}
-
-.codicon-debug-breakpoint.codicon-debug-breakpoint-stackframe-focused::after {
-	position: absolute;
-}
-
-.inline-breakpoint-widget.codicon-debug-breakpoint-stackframe-dot::after {
-	content: "\eb8b";
-}
-
-.codicon-debug-breakpoint.codicon-debug-breakpoint-stackframe-focused::after {
+.codicon-debug-breakpoint.codicon-debug-breakpoint-stackframe-focused::after,
+.codicon-debug-breakpoint.codicon-debug-breakpoint-stackframe::after {
 	content: "\eb8a";
+	position: absolute;
 }
 
 .monaco-editor .inline-breakpoint-widget.line-start {
diff --git a/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css b/src/vs/workbench/contrib/debug/browser/media/debugViewlet.css
@@ -374,10 +374,6 @@
 	justify-content: center;
 }
 
-.debug-viewlet .debug-breakpoints .breakpoint > .codicon-debug-breakpoint-stackframe-dot::before {
-	content: "\ea71";
-}
-
 .debug-viewlet .debug-breakpoints .breakpoint > .file-path {
 	opacity: 0.7;
 	font-size: 0.9em;
