Fix microsoft#71790

sandy081 · sandy081 · commit c6e49d4bc7fa · 2019-05-28T12:25:23.000+02:00
diff --git a/src/vs/workbench/contrib/markers/browser/markersPanel.ts b/src/vs/workbench/contrib/markers/browser/markersPanel.ts
@@ -162,7 +162,11 @@ export class MarkersPanel extends Panel implements IMarkerFilterController {
 			return;
 		}
 
-		this.tree.getHTMLElement().focus();
+		if (this.isEmpty()) {
+			this.messageBoxContainer.focus();
+		} else {
+			this.tree.getHTMLElement().focus();
+		}
 	}
 
 	public focusFilter(): void {
@@ -470,11 +474,15 @@ export class MarkersPanel extends Panel implements IMarkerFilterController {
 		}
 	}
 
+	private isEmpty(): boolean {
+		const { total, filtered } = this.getFilterStats();
+		return total === 0 || filtered === 0;
+	}
+
 	private render(): void {
 		this.cachedFilterStats = undefined;
 		this.tree.setChildren(null, createModelIterator(this.markersWorkbenchService.markersModel));
-		const { total, filtered } = this.getFilterStats();
-		dom.toggleClass(this.treeContainer, 'hidden', total === 0 || filtered === 0);
+		dom.toggleClass(this.treeContainer, 'hidden', this.isEmpty());
 		this.renderMessage();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,11 @@ export class MarkersPanel extends Panel implements IMarkerFilterController {`
`162`	`162`	`return;`
`163`	`163`	`}`
`164`	`164`
`165`		`- this.tree.getHTMLElement().focus();`
	`165`	`+ if (this.isEmpty()) {`
	`166`	`+ this.messageBoxContainer.focus();`
	`167`	`+ } else {`
	`168`	`+ this.tree.getHTMLElement().focus();`
	`169`	`+ }`
`166`	`170`	`}`
`167`	`171`
`168`	`172`	`public focusFilter(): void {`
`@@ -470,11 +474,15 @@ export class MarkersPanel extends Panel implements IMarkerFilterController {`
`470`	`474`	`}`
`471`	`475`	`}`
`472`	`476`
	`477`	`+ private isEmpty(): boolean {`
	`478`	`+ const { total, filtered } = this.getFilterStats();`
	`479`	`+ return total === 0 \|\| filtered === 0;`
	`480`	`+ }`
	`481`	`+`
`473`	`482`	`private render(): void {`
`474`	`483`	`this.cachedFilterStats = undefined;`
`475`	`484`	`this.tree.setChildren(null, createModelIterator(this.markersWorkbenchService.markersModel));`
`476`		`- const { total, filtered } = this.getFilterStats();`
`477`		`- dom.toggleClass(this.treeContainer, 'hidden', total === 0 \|\| filtered === 0);`
	`485`	`+ dom.toggleClass(this.treeContainer, 'hidden', this.isEmpty());`
`478`	`486`	`this.renderMessage();`
`479`	`487`	`}`
`480`	`488`