fixes microsoft#101176

joaomoreno · joaomoreno · commit b417b76d467b · 2020-06-29T11:33:21.000+02:00
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -259,6 +259,7 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
 	static readonly TEMPLATE_ID = 'input';
 	get templateId(): string { return InputRenderer.TEMPLATE_ID; }
 
+	private inputWidgets = new Map<ISCMInput, SCMInputWidget>();
 	private contentHeights = new WeakMap<ISCMInput, number>();
 
 	constructor(
@@ -285,6 +286,10 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
 		templateData.inputWidget.input = input;
 		disposables.add({ dispose: () => templateData.inputWidget.input = undefined });
 
+		// Remember widget
+		this.inputWidgets.set(input, templateData.inputWidget);
+		disposables.add({ dispose: () => this.inputWidgets.delete(input) });
+
 		// Rerender the element whenever the editor content height changes
 		const onDidChangeContentHeight = () => {
 			const contentHeight = templateData.inputWidget.getContentHeight();
@@ -333,6 +338,10 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
 	getHeight(input: ISCMInput): number {
 		return (this.contentHeights.get(input) ?? InputRenderer.DEFAULT_HEIGHT) + 10;
 	}
+
+	getRenderedInputWidget(input: ISCMInput): SCMInputWidget | undefined {
+		return this.inputWidgets.get(input);
+	}
 }
 
 interface ResourceGroupTemplate {
@@ -845,6 +854,7 @@ class ViewModel {
 		private repositories: ISequence<ISCMRepository>,
 		private tree: WorkbenchCompressibleObjectTree<TreeElement, FuzzyScore>,
 		private menus: SCMMenus,
+		private inputRenderer: InputRenderer,
 		private _mode: ViewModelMode,
 		private _sortKey: ViewModelSortKey,
 		@IEditorService protected editorService: IEditorService,
@@ -1023,6 +1033,19 @@ class ViewModel {
 		}
 	}
 
+	focus() {
+		for (const repository of this.repositories.elements) {
+			const widget = this.inputRenderer.getRenderedInputWidget(repository.input);
+
+			if (widget) {
+				widget.focus();
+				return;
+			}
+		}
+
+		this.tree.domFocus();
+	}
+
 	getViewActions(): IAction[] {
 		if (this.repositories.elements.length !== 1) {
 			return [];
@@ -1387,6 +1410,10 @@ class SCMInputWidget extends Disposable {
 		this.renderValidation();
 	}
 
+	focus(): void {
+		this.inputEditor.focus();
+	}
+
 	private renderValidation(): void {
 		this.validationDisposable.dispose();
 
@@ -1546,7 +1573,7 @@ export class SCMViewPane extends ViewPane {
 			viewMode = storageMode;
 		}
 
-		this.viewModel = this.instantiationService.createInstance(ViewModel, repositories, this.tree, this.menus, viewMode, ViewModelSortKey.Path);
+		this.viewModel = this.instantiationService.createInstance(ViewModel, repositories, this.tree, this.menus, inputRenderer, viewMode, ViewModelSortKey.Path);
 		this._register(this.viewModel);
 
 		addClass(this.listContainer, 'file-icon-themable-tree');
@@ -1594,7 +1621,7 @@ export class SCMViewPane extends ViewPane {
 		super.focus();
 
 		if (this.isExpanded()) {
-			this.tree.domFocus();
+			this.viewModel.focus();
 		}
 	}
 
