Skip to content

Commit

Permalink
stronger check
Browse files Browse the repository at this point in the history
  • Loading branch information
bpasero committed Jul 18, 2022
1 parent d6452a3 commit 1d9c4e8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/vs/workbench/common/editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 1d9c4e8

Please sign in to comment.