From 2eeac2f8004b132fb7a1c9de946aa42fcd6409d0 Mon Sep 17 00:00:00 2001
From: mamphis <mattis.wacker@gmx.de>
Date: Thu, 18 Nov 2021 21:10:09 +0100
Subject: [PATCH 1/3] glyphMargin: Wrapped codicons inside parent div

This patch resolves #137436.
When multiple classes (e.g. codicon-debug-breakpoint,codicon-debug-hint)
are added they would disable the ::after content for consecutive classes
for the HTML Element.

This patch adds a parent element to the overlay and adds all classes as
seperated divs, so they can be drawn on top of each other.
---
 .../editor/browser/viewParts/glyphMargin/glyphMargin.ts  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
index 761b0ce1afb6c..1d88adbba7d8c 100644
--- a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
+++ b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
@@ -166,7 +166,7 @@ export class GlyphMarginOverlay extends DedupOverlay {
 		const lineHeight = this._lineHeight.toString();
 		const left = this._glyphMarginLeft.toString();
 		const width = this._glyphMarginWidth.toString();
-		const common = '" style="left:' + left + 'px;width:' + width + 'px' + ';height:' + lineHeight + 'px;"></div>';
+		const common = (content: string = '') => `" style="left:${left}px;width:${width}px;height:${lineHeight}px;">${content}</div>`;
 
 		const output: string[] = [];
 		for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) {
@@ -176,11 +176,8 @@ export class GlyphMarginOverlay extends DedupOverlay {
 			if (classNames.length === 0) {
 				output[lineIndex] = '';
 			} else {
-				output[lineIndex] = (
-					'<div class="cgmr codicon '
-					+ classNames.join(' ')
-					+ common
-				);
+				// Map codicons inside parent div
+				output[lineIndex] = `<div class="cgmr${common(classNames.map(className => `<div class="cgmr codicon ${className}${common()}`).join(''))}</div>`;
 			}
 		}
 

From f8dd92c0f49dec6272ddaead4f8dd5053f7c5d37 Mon Sep 17 00:00:00 2001
From: mamphis <mattis.wacker@gmx.de>
Date: Fri, 19 Nov 2021 11:32:07 +0100
Subject: [PATCH 2/3] glyphMargin: Reverted previous change

This path reverts the previous change of wrapping each class in a parent
div.
---
 .../editor/browser/viewParts/glyphMargin/glyphMargin.ts  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
index 1d88adbba7d8c..761b0ce1afb6c 100644
--- a/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
+++ b/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.ts
@@ -166,7 +166,7 @@ export class GlyphMarginOverlay extends DedupOverlay {
 		const lineHeight = this._lineHeight.toString();
 		const left = this._glyphMarginLeft.toString();
 		const width = this._glyphMarginWidth.toString();
-		const common = (content: string = '') => `" style="left:${left}px;width:${width}px;height:${lineHeight}px;">${content}</div>`;
+		const common = '" style="left:' + left + 'px;width:' + width + 'px' + ';height:' + lineHeight + 'px;"></div>';
 
 		const output: string[] = [];
 		for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) {
@@ -176,8 +176,11 @@ export class GlyphMarginOverlay extends DedupOverlay {
 			if (classNames.length === 0) {
 				output[lineIndex] = '';
 			} else {
-				// Map codicons inside parent div
-				output[lineIndex] = `<div class="cgmr${common(classNames.map(className => `<div class="cgmr codicon ${className}${common()}`).join(''))}</div>`;
+				output[lineIndex] = (
+					'<div class="cgmr codicon '
+					+ classNames.join(' ')
+					+ common
+				);
 			}
 		}
 

From fb7ebd307ec83363deae67fedb76102cc85f8d74 Mon Sep 17 00:00:00 2001
From: mamphis <mattis.wacker@gmx.de>
Date: Fri, 19 Nov 2021 11:36:12 +0100
Subject: [PATCH 3/3] Style::debug.contribution: change content of
 breakpoint+stackframe

This readds a content-element for codicons which was removed in
49efe65bc3769cff56182bfd5ce881fa4654ca6a.

The content applies when both the classes `codicon-debug-breakpoint
and `codicon-debug-stackframe`.
---
 .../contrib/debug/browser/media/debug.contribution.css      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css b/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
index 400f056ad1cf0..64f1d065ccd0c 100644
--- a/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
+++ b/src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
@@ -31,6 +31,12 @@
 	margin-top: -1px;
 }
 
+.codicon-debug-breakpoint.codicon-debug-stackframe-focused::after,
+.codicon-debug-breakpoint.codicon-debug-stackframe::after {
+	content: '\eb8a';
+	position: absolute;
+}
+
 .monaco-editor .debug-top-stack-frame-column {
 	font: normal normal normal 16px/1 codicon;
 	text-rendering: auto;