Revert "Get rid of canHandleDiff"

This reverts commit 6056645892.

src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts

@@ -85,6 +85,7 @@ class SearchEditorContribution implements IWorkbenchContribution {
 			},
 			{
 				singlePerResource: true,
+				canHandleDiff: false,
 				canSupportResource: resource => (extname(resource) === SEARCH_EDITOR_EXT)
 			},
 			({ resource }) => {

src/vs/workbench/contrib/terminal/browser/terminalService.ts

@@ -169,6 +169,7 @@ export class TerminalService implements ITerminalService {
 				priority: RegisteredEditorPriority.exclusive
 			},
 			{
+				canHandleDiff: false,
 				canSupportResource: uri => uri.scheme === Schemas.vscodeTerminal,
 				singlePerResource: true
 			},

src/vs/workbench/services/editor/browser/editorOverrideService.ts

@@ -130,7 +130,8 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
 			return OverrideStatus.NONE;
 		}
 
-		if (selectedEditor.createDiffEditorInput === undefined && isResourceDiffEditorInput(editor)) {
+		const handlesDiff = typeof selectedEditor.options?.canHandleDiff === 'function' ? selectedEditor.options.canHandleDiff() : selectedEditor.options?.canHandleDiff;
+		if (handlesDiff === false && isResourceDiffEditorInput(editor)) {
 			return OverrideStatus.NONE;
 		}
 

src/vs/workbench/services/editor/common/editorOverrideService.ts

@@ -82,6 +82,10 @@ export type RegisteredEditorOptions = {
 	 * If your editor cannot be opened in multiple groups for the same resource
 	 */
 	singlePerResource?: boolean | (() => boolean);
+	/**
+	 * If your editor supports diffs
+	 */
+	canHandleDiff?: boolean | (() => boolean);
 
 	/**
 	 * Whether or not you can support opening the given resource.

src/vs/workbench/services/editor/test/browser/editorOverrideService.test.ts

@@ -39,7 +39,7 @@ suite('EditorOverrideService', () => {
 				detail: 'Test Editor Details',
 				priority: RegisteredEditorPriority.default
 			},
-			{},
+			{ canHandleDiff: false },
 			({ resource, options }, group) => ({ editor: new TestFileEditorInput(URI.parse(resource.toString()), TEST_EDITOR_INPUT_ID) }),
 		);
 
@@ -63,7 +63,7 @@ suite('EditorOverrideService', () => {
 				detail: 'Test Editor Details',
 				priority: RegisteredEditorPriority.default
 			},
-			{},
+			{ canHandleDiff: false },
 			({ resource, options }, group) => ({ editor: new TestFileEditorInput(URI.parse(resource.toString()), TEST_EDITOR_INPUT_ID) }),
 			({ resource, options }, group) => ({ editor: new TestFileEditorInput((resource ? resource : URI.from({ scheme: Schemas.untitled })), UNTITLED_TEST_EDITOR_INPUT_ID) }),
 		);

src/vs/workbench/services/editor/test/browser/editorService.test.ts

@@ -204,7 +204,7 @@ suite('EditorService', () => {
 		disposables.add(accessor.editorOverrideService.registerEditor(
 			'*.editor-service-override-tests',
 			{ id: TEST_EDITOR_INPUT_ID, label: 'Label', priority: RegisteredEditorPriority.exclusive },
-			{},
+			{ canHandleDiff: true },
 			editor => {
 				editorFactoryCalled++;
 				lastEditorFactoryEditor = editor;