fix: #200046 (#200485)

microsoft · Dec 15, 2023 · 74bf30a · 74bf30a
1 parent baab9bd
commit 74bf30a
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -3249,12 +3249,30 @@ class SCMTreeDataSource implements IAsyncDataSource<ISCMViewService, TreeElement
 
 			// Incoming/Outgoing Separator
 			if (historyItemGroups.length > 0) {
-				children.push({
-					label: localize('syncSeparatorHeader', "Incoming/Outgoing"),
-					ariaLabel: localize('syncSeparatorHeaderAriaLabel', "Incoming and outgoing changes"),
-					repository: inputOrElement,
-					type: 'separator'
-				} as SCMViewSeparatorElement);
+				const showIncomingChanges = this.showIncomingChanges();
+				const showOutgoingChanges = this.showOutgoingChanges();
+				if (showIncomingChanges !== 'never' && showOutgoingChanges !== 'never') {
+					children.push({
+						label: localize('syncSeparatorHeader', "Incoming/Outgoing"),
+						ariaLabel: localize('syncSeparatorHeaderAriaLabel', "Incoming and outgoing changes"),
+						repository: inputOrElement,
+						type: 'separator'
+					} as SCMViewSeparatorElement);
+				} else if (showIncomingChanges === 'never') {
+					children.push({
+						label: localize('syncOutgoingSeparatorHeader', "Outgoing"),
+						ariaLabel: localize('syncOutgoingSeparatorHeaderAriaLabel', "Outgoing changes"),
+						repository: inputOrElement,
+						type: 'separator'
+					} as SCMViewSeparatorElement);
+				} else if (showOutgoingChanges === 'never') {
+					children.push({
+						label: localize('syncIncomingSeparatorHeader', "Incoming"),
+						ariaLabel: localize('syncIncomingSeparatorHeaderAriaLabel', "Incoming changes"),
+						repository: inputOrElement,
+						type: 'separator'
+					} as SCMViewSeparatorElement);
+				}
 			}
 
 			children.push(...historyItemGroups);