Update DiffViewProvider.ts

No async / await: We don't need to await the timeout. We just want to schedule checkAndResolve to run in the future, not pause the entire function. setTimeout does this perfectly on its own.
No if Statement: The confusing if statement is gone. We are no longer checking the return value because we don't need to do anything with it in this specific spot. The primary purpose here is just to trigger the check.
Clear Intent: The corrected code is much clearer. Its only job is to kick off the checkAndResolve function after 100ms. This acts as a simple, manual trigger to supplement the main onDidChangeTabGroups event listener, which is the more robust part of the fix.

Author: Mnehmos

src/integrations/editor/DiffViewProvider.ts

@@ -393,9 +393,9 @@ export class DiffViewProvider {
 			.map((tab) =>
 				vscode.window.tabGroups.close(tab).then(
 					() => undefined,
-(err) => {
-  // Ignore errors when closing diff tabs - they may already be closed
-},
+					(err) => {
+						// Ignore errors when closing diff tabs - they may already be closed
+					},
 				),
 			)
 
@@ -479,11 +479,9 @@ export class DiffViewProvider {
 						{ preserveFocus: true },
 					)
 					.then(
-						async () => {
+						() => {
 							// Give a brief moment for the editor to appear in tab groups
-							await new Promise((r) => setTimeout(r, 100))
-							if (!checkAndResolve()) {
-							}
+							setTimeout(checkAndResolve, 100)
 						},
 						(err) => {
 							if (timeoutId) clearTimeout(timeoutId)