Fix browser host open additional files in merge mode (microsoft#205663)

xiaoyun94 · FANG.Ge · web-flow · commit 5c2f9eb17760 · 2024-02-20T16:55:44.000+01:00
Co-authored-by: FANG.Ge &lt;fang.g@bigforce.cn&gt;
diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts
@@ -307,7 +307,7 @@ export class BrowserHostService extends Disposable implements IHostService {
 				}
 
 				// Support diffMode
-				if (options?.diffMode && fileOpenables.length === 2) {
+				else if (options?.diffMode && fileOpenables.length === 2) {
 					const editors = coalesce(await pathsToEditors(fileOpenables, this.fileService, this.logService));
 					if (editors.length !== 2 || !isResourceEditorInput(editors[0]) || !isResourceEditorInput(editors[1])) {
 						return; // invalid resources

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ export class BrowserHostService extends Disposable implements IHostService {`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`// Support diffMode`
`310`		`- if (options?.diffMode && fileOpenables.length === 2) {`
	`310`	`+ else if (options?.diffMode && fileOpenables.length === 2) {`
`311`	`311`	`const editors = coalesce(await pathsToEditors(fileOpenables, this.fileService, this.logService));`
`312`	`312`	`if (editors.length !== 2 \|\| !isResourceEditorInput(editors[0]) \|\| !isResourceEditorInput(editors[1])) {`
`313`	`313`	`return; // invalid resources`