Fix some search tree display issues with action bar and count badge

src/vs/workbench/parts/search/browser/media/searchview.css

@@ -210,7 +210,6 @@
 }
 
 .search-view .linematch > .match {
-	flex: 1;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
@@ -233,15 +232,13 @@
 	margin: 0;
 }
 
+.search-view .monaco-tree .monaco-tree-row:hover:not(.highlighted) .monaco-action-bar,
 .search-view .monaco-tree .monaco-tree-row.focused .monaco-action-bar {
-	width: 0; /* in order to support a11y with keyboard, we use width: 0 to hide the actions, which still allows to "Tab" into the actions */
-	display: block;
+	display: inline-block;
 }
 
-.search-view .monaco-tree .monaco-tree-row:hover:not(.highlighted) .monaco-action-bar,
-.search-view .monaco-tree .monaco-tree-row.focused .monaco-action-bar {
-	width: inherit;
-	display: block;
+.search-view:not(.wide) .monaco-tree .monaco-tree-row .linematch .actionBarContainer {
+	flex: 1;
 }
 
 .search-view .monaco-tree .monaco-tree-row .monaco-action-bar .action-label {
@@ -287,24 +284,15 @@
 	margin-right: 12px;
 }
 
-.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row:hover .content .filematch .monaco-count-badge,
-.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row:hover .content .foldermatch .monaco-count-badge,
-.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row:hover .content .linematch .monaco-count-badge,
-.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row.focused .content .filematch .monaco-count-badge,
-.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row.focused .content .foldermatch .monaco-count-badge,
-.search-view:not(.wide) > .results > .monaco-tree .monaco-tree-row.focused .content .linematch .monaco-count-badge {
+.search-view > .results > .monaco-tree .monaco-tree-row:hover .content .filematch .monaco-count-badge,
+.search-view > .results > .monaco-tree .monaco-tree-row:hover .content .foldermatch .monaco-count-badge,
+.search-view > .results > .monaco-tree .monaco-tree-row:hover .content .linematch .monaco-count-badge,
+.search-view > .results > .monaco-tree .monaco-tree-row.focused .content .filematch .monaco-count-badge,
+.search-view > .results > .monaco-tree .monaco-tree-row.focused .content .foldermatch .monaco-count-badge,
+.search-view > .results > .monaco-tree .monaco-tree-row.focused .content .linematch .monaco-count-badge {
 	display: none;
 }
 
-.search-view.wide > .results > .monaco-tree .monaco-tree-row:hover .content .filematch .badge,
-.search-view.wide > .results > .monaco-tree .monaco-tree-row:hover .content .foldermatch .badge,
-.search-view.wide > .results > .monaco-tree .monaco-tree-row:hover .content .linematch .badge,
-.search-view.wide > .results > .monaco-tree .monaco-tree-row.focused .content .filematch .badge,
-.search-view.wide > .results > .monaco-tree .monaco-tree-row.focused .content .foldermatch .badge,
-.search-view.wide > .results > .monaco-tree .monaco-tree-row.focused .content .linematch .badge {
-	flex: 1;
-}
-
 .search-view .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions .action-remove,
 .vs-dark .monaco-workbench .search-view .focused .monaco-tree-row.selected:not(.highlighted) > .content.actions .action-remove {
 	background: url("action-remove-focus.svg") center center no-repeat;

src/vs/workbench/parts/search/browser/searchResultsView.ts

@@ -233,7 +233,8 @@ export class SearchRenderer extends Disposable implements IRenderer {
 		const match = DOM.append(parent, DOM.$('span.findInFileMatch'));
 		const replace = DOM.append(parent, DOM.$('span.replaceMatch'));
 		const after = DOM.append(parent, DOM.$('span'));
-		const actions = new ActionBar(container, { animated: false });
+		const actionBarContainer = DOM.append(container, DOM.$('span.actionBarContainer'));
+		const actions = new ActionBar(actionBarContainer, { animated: false });
 
 		return {
 			parent,