Fix test format errors and improve main/master branch ordering

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

Author: Copilot

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

@@ -51,6 +51,16 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
 		if (bIsMainOrMaster && !aIsMainOrMaster) {
 			return 1;
 		}
+		
+		// When both are main/master, prioritize main over master
+		if (aIsMainOrMaster && bIsMainOrMaster) {
+			if (aLabel === 'main' && bLabel === 'master') {
+				return -1;
+			}
+			if (aLabel === 'master' && bLabel === 'main') {
+				return 1;
+			}
+		}
 	}
 
 	// Sort by the score

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

@@ -357,11 +357,7 @@ suite('TerminalCompletionModel', function () {
 				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' }
-			]);
+			assertItems(model, ['main', 'master', 'feature-branch']);
 		});
 	});
 });