Revert "Move git branch boost after score comparison to avoid global prioritization"

This reverts commit b3275ed.

Author: Tyriar

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

@@ -44,23 +44,6 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
 		return score;
 	}
 
-	// Boost main and master branches for git commands (only when scores are equal)
-	// HACK: Currently this just matches leading line content, it should eventually check the
-	//       completion type is a branch
-	if (a.completion.kind === TerminalCompletionItemKind.Method && b.completion.kind === TerminalCompletionItemKind.Method && /^\s*git\b/.test(leadingLineContent)) {
-		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;
-		}
-	}
-
 	// Boost inline completions
 	if (a.completion.kind === TerminalCompletionItemKind.InlineSuggestion && a.completion.kind !== b.completion.kind) {
 		return -1;
@@ -98,6 +81,23 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
 		}
 	}
 
+	// Boost main and master branches for git commands
+	// HACK: Currently this just matches leading line content, it should eventually check the
+	//       completion type is a branch
+	if (a.completion.kind === TerminalCompletionItemKind.Method && b.completion.kind === TerminalCompletionItemKind.Method && /^\s*git\b/.test(leadingLineContent)) {
+		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 more detailed completions
 	if (a.completion.kind === TerminalCompletionItemKind.Method && b.completion.kind === TerminalCompletionItemKind.Method) {
 		if (typeof a.completion.label !== 'string' && a.completion.label.description && typeof b.completion.label !== 'string' && b.completion.label.description) {

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

@@ -348,7 +348,11 @@ suite('TerminalCompletionModel', function () {
 				createItem({ label: { label: 'main', description: 'Main branch' } })
 			];
 			const model = new TerminalCompletionModel(items, new LineContext('git checkout ', 0));
-			assertItems(model, ['main', 'master', 'feature-branch']);
+			assertItems(model, [
+				{ label: "main", description: "Main branch" },
+				{ label: "master", description: "Master branch" },
+				{ label: "feature-branch", description: "Feature branch" },
+			]);
 		});
 	});
 });