fixes microsoft#102358

joaomoreno · joaomoreno · commit d5942ca8f601 · 2020-07-14T10:04:35.000Z
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -316,19 +316,19 @@ class InputRenderer implements ICompressibleTreeRenderer<ISCMInput, FuzzyScore,
 			}
 		};
 
-		const initialRender = () => {
+		const startListeningContentHeightChange = () => {
 			disposables.add(templateData.inputWidget.onDidChangeContentHeight(onDidChangeContentHeight));
-			onDidChangeContentHeight();
-		};
 
-		const contentHeight = templateData.inputWidget.getContentHeight();
+			const contentHeight = templateData.inputWidget.getContentHeight();
 
-		if (contentHeight !== InputRenderer.DEFAULT_HEIGHT) {
-			const timeout = setTimeout(initialRender, 0);
-			disposables.add({ dispose: () => clearTimeout(timeout) });
-		} else {
-			initialRender();
-		}
+			if (contentHeight !== InputRenderer.DEFAULT_HEIGHT) {
+				onDidChangeContentHeight();
+			}
+		};
+
+		// Setup height change listener on next tick
+		const timeout = setTimeout(startListeningContentHeightChange, 0);
+		disposables.add({ dispose: () => clearTimeout(timeout) });
 
 		// Layout the editor whenever the outer layout happens
 		const layoutEditor = () => templateData.inputWidget.layout();
