microsoft#13041 - Down arrow on Search is not navigating to results

sandy081 · sandy081 · commit dcce4939ae0f · 2016-09-30T10:41:16.000+02:00
diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts
@@ -488,16 +488,16 @@ export class SearchViewlet extends Viewlet {
 
 	public focusNextInputBox(): void {
 		if (this.searchWidget.searchInputHasFocus()) {
-			this.searchWidget.focus(true, true);
+			if (this.searchWidget.isReplaceShown()) {
+				this.searchWidget.focus(true, true);
+			} else {
+				this.moveFocusFromSearchOrReplace();
+			}
 			return;
 		}
 
 		if (this.searchWidget.replaceInputHasFocus()) {
-			if (this.showsFileTypes()) {
-				this.toggleFileTypes(true, this.showsFileTypes());
-			} else {
-				this.selectTreeIfNotSelected();
-			}
+			this.moveFocusFromSearchOrReplace();
 			return;
 		}
 
@@ -513,6 +513,14 @@ export class SearchViewlet extends Viewlet {
 		}
 	}
 
+	private moveFocusFromSearchOrReplace() {
+		if (this.showsFileTypes()) {
+			this.toggleFileTypes(true, this.showsFileTypes());
+		} else {
+			this.selectTreeIfNotSelected();
+		}
+	}
+
 	public focusPreviousInputBox(): void {
 		if (this.searchWidget.searchInputHasFocus()) {
 			return;
