From fd3e5b204bd837ce550cfcbfe264cf2eeb4f77ba Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Thu, 12 Mar 2020 15:03:19 +0100
Subject: [PATCH] fix #92489

---
 .../quickinput/browser/media/quickInput.css   | 26 ++++++++-----------
 .../quickinput/browser/quickInputList.ts      |  5 ----
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/vs/base/parts/quickinput/browser/media/quickInput.css b/src/vs/base/parts/quickinput/browser/media/quickInput.css
index 64e468d2017..45c205f92a5 100644
--- a/src/vs/base/parts/quickinput/browser/media/quickInput.css
+++ b/src/vs/base/parts/quickinput/browser/media/quickInput.css
@@ -199,8 +199,8 @@
 	opacity: 1;
 }
 
-.quick-input-list-entry.quick-input-list-separator-label .quick-input-list-entry-keybinding {
-	margin-right: 8px; /* separate from the separator label if any */
+.quick-input-list .quick-input-list-entry .quick-input-list-entry-keybinding {
+	margin-right: 8px; /* separate from the separator label or scrollbar if any */
 }
 
 .quick-input-list .quick-input-list-label-meta {
@@ -214,17 +214,13 @@
 	font-weight: bold;
 }
 
-.quick-input-list .quick-input-list-separator {
-	margin-right: 18px;
-}
-
-.quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-separator,
-.quick-input-list .monaco-list-row.focused .quick-input-list-entry.has-actions .quick-input-list-separator {
-	margin-right: 0;
+.quick-input-list .quick-input-list-entry .quick-input-list-separator {
+	margin-right: 8px; /* separate from keybindings or actions */
 }
 
 .quick-input-list .quick-input-list-entry-action-bar {
-	display: none;
+	display: flex;
+	visibility: hidden; /* not using display: none here to not flicker too much */
 	flex: 0;
 	overflow: visible;
 }
@@ -240,16 +236,16 @@
 	margin-top: 1px;
 }
 
-.quick-input-list .quick-input-list-entry-action-bar ul:first-child .action-label.codicon {
-	margin-left: 2px;
+.quick-input-list .quick-input-list-entry-action-bar {
+	margin-right: 4px; /* separate from scrollbar */
 }
 
-.quick-input-list .quick-input-list-entry-action-bar ul:last-child .action-label.codicon {
-	margin-right: 8px;
+.quick-input-list .quick-input-list-entry-action-bar .action-label.codicon {
+	margin-right: 4px; /* separate actions */
 }
 
 .quick-input-list .quick-input-list-entry.always-visible-actions .quick-input-list-entry-action-bar,
 .quick-input-list .quick-input-list-entry:hover .quick-input-list-entry-action-bar,
 .quick-input-list .monaco-list-row.focused .quick-input-list-entry-action-bar {
-	display: flex;
+	visibility: visible;
 }
diff --git a/src/vs/base/parts/quickinput/browser/quickInputList.ts b/src/vs/base/parts/quickinput/browser/quickInputList.ts
index c132351b323..509ac6f03a3 100644
--- a/src/vs/base/parts/quickinput/browser/quickInputList.ts
+++ b/src/vs/base/parts/quickinput/browser/quickInputList.ts
@@ -174,11 +174,6 @@ class ListElementRenderer implements IListRenderer<ListElement, IListElementTemp
 		} else {
 			dom.removeClass(data.entry, 'quick-input-list-separator-border');
 		}
-		if (element.separator?.label) {
-			dom.addClass(data.entry, 'quick-input-list-separator-label');
-		} else {
-			dom.removeClass(data.entry, 'quick-input-list-separator-label');
-		}
 
 		// Actions
 		data.actionBar.clear();