Implement git branch prioritization in compareCompletionsFn

- Revert changes to upstream/git.ts per feedback
- Add git branch boosting logic to terminalCompletionModel.ts compareCompletionsFn
- Boost main and master branches for git commands from terminal-suggest provider
- Add comprehensive test suite for git branch priority sorting
- Follows same pattern as existing LSP provider boost logic

Co-authored-by: Tyriar <[email protected]>

Author: Copilot

extensions/terminal-suggest/src/completions/upstream/git.ts

@@ -100,15 +100,11 @@ const postProcessBranches =
 					name = name.slice(0, space);
 				}
 
-				// Boost main and master branches to the top
-				const isMainOrMaster = name === "main" || name === "master";
-				const priority = isMainOrMaster ? 76 : 75;
-
 				return {
 					name,
 					description,
 					icon: "fig://icon?type=git",
-					priority,
+					priority: 75,
 				};
 			})
 			.filter((suggestion) => {

extensions/terminal-suggest/src/test/completions/upstream/git-branches.test.ts

@@ -38,6 +38,23 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
 		return 1;
 	}
 
+	// Boost main and master branches for git commands
+	const terminalSuggestProviderId = 'terminal-suggest';
+	const isGitCommand = /^\s*git\b/.test(leadingLineContent);
+	if (isGitCommand && a.completion.provider === terminalSuggestProviderId && b.completion.provider === terminalSuggestProviderId) {
+		const aLabel = typeof a.completion.label === 'string' ? a.completion.label : a.completion.label.label;
+		const bLabel = typeof b.completion.label === 'string' ? b.completion.label : b.completion.label.label;
+		const aIsMainOrMaster = aLabel === 'main' || aLabel === 'master';
+		const bIsMainOrMaster = bLabel === 'main' || bLabel === 'master';
+
+		if (aIsMainOrMaster && !bIsMainOrMaster) {
+			return -1;
+		}
+		if (bIsMainOrMaster && !aIsMainOrMaster) {
+			return 1;
+		}
+	}
+
 	// Sort by the score
 	let score = b.score[0] - a.score[0];
 	if (score !== 0) {

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts

@@ -296,4 +296,72 @@ suite('TerminalCompletionModel', function () {
 
 
 	});
+
+	suite('git branch priority sorting', () => {
+		test('should prioritize main and master branches for git commands', () => {
+			const items = [
+				createItem({ label: 'feature-branch', provider: 'terminal-suggest' }),
+				createItem({ label: 'master', provider: 'terminal-suggest' }),
+				createItem({ label: 'development', provider: 'terminal-suggest' }),
+				createItem({ label: 'main', provider: 'terminal-suggest' })
+			];
+			const model = new TerminalCompletionModel(items, new LineContext('git checkout ', 0));
+			assertItems(model, ['main', 'master', 'development', 'feature-branch']);
+		});
+
+		test('should prioritize main and master branches for git switch command', () => {
+			const items = [
+				createItem({ label: 'feature-branch', provider: 'terminal-suggest' }),
+				createItem({ label: 'main', provider: 'terminal-suggest' }),
+				createItem({ label: 'another-feature', provider: 'terminal-suggest' }),
+				createItem({ label: 'master', provider: 'terminal-suggest' })
+			];
+			const model = new TerminalCompletionModel(items, new LineContext('git switch ', 0));
+			assertItems(model, ['main', 'master', 'another-feature', 'feature-branch']);
+		});
+
+		test('should not prioritize main and master for non-git commands', () => {
+			const items = [
+				createItem({ label: 'feature-branch', provider: 'terminal-suggest' }),
+				createItem({ label: 'master', provider: 'terminal-suggest' }),
+				createItem({ label: 'main', provider: 'terminal-suggest' })
+			];
+			const model = new TerminalCompletionModel(items, new LineContext('ls ', 0));
+			assertItems(model, ['feature-branch', 'main', 'master']);
+		});
+
+		test('should only apply to terminal-suggest provider', () => {
+			const items = [
+				createItem({ label: 'feature-branch', provider: 'other-provider' }),
+				createItem({ label: 'master', provider: 'other-provider' }),
+				createItem({ label: 'main', provider: 'other-provider' })
+			];
+			const model = new TerminalCompletionModel(items, new LineContext('git checkout ', 0));
+			assertItems(model, ['feature-branch', 'main', 'master']);
+		});
+
+		test('should handle git commands with leading whitespace', () => {
+			const items = [
+				createItem({ label: 'feature-branch', provider: 'terminal-suggest' }),
+				createItem({ label: 'master', provider: 'terminal-suggest' }),
+				createItem({ label: 'main', provider: 'terminal-suggest' })
+			];
+			const model = new TerminalCompletionModel(items, new LineContext('  git checkout ', 0));
+			assertItems(model, ['main', 'master', 'feature-branch']);
+		});
+
+		test('should work with complex label objects', () => {
+			const items = [
+				createItem({ label: { label: 'feature-branch', description: 'Feature branch' }, provider: 'terminal-suggest' }),
+				createItem({ label: { label: 'master', description: 'Master branch' }, provider: 'terminal-suggest' }),
+				createItem({ label: { label: 'main', description: 'Main branch' }, provider: 'terminal-suggest' })
+			];
+			const model = new TerminalCompletionModel(items, new LineContext('git checkout ', 0));
+			assertItems(model, [
+				{ label: 'main', description: 'Main branch' },
+				{ label: 'master', description: 'Master branch' },
+				{ label: 'feature-branch', description: 'Feature branch' }
+			]);
+		});
+	});
 });