From 1d9c4e80e47f94515afab1e13a3c434b38ea057c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjamin.pasero@microsoft.com>
Date: Mon, 18 Jul 2022 17:25:39 +0200
Subject: [PATCH] stronger check

---
 src/vs/workbench/common/editor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index f4f75f9e367f2..9de48eb4b11ce 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -568,7 +568,7 @@ export function isResourceMergeEditorInput(editor: unknown): editor is IResource
 
 	const candidate = editor as IResourceMergeEditorInput | undefined;
 
-	return candidate?.base !== undefined && candidate.input1 !== undefined && candidate.input2 !== undefined && candidate.result !== undefined;
+	return URI.isUri(candidate?.base.resource) && URI.isUri(candidate?.input1.resource) && URI.isUri(candidate?.input2.resource) && URI.isUri(candidate?.result.resource);
 }
 
 export const enum Verbosity {