Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-23 08:39:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Respect canHandleDiff optionality

Browse Source
This commit is contained in:
Logan Ramos
2021-09-02 11:17:51 -04:00
parent c2d0a69f87
commit 1dfded76c7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/editor/browser/editorResolverService.ts
+3 -1
View File
@@ -186,7 +186,9 @@ export class EditorResolverService extends Disposable implements IEditorResolver
// If no override we take the selected editor id so that matches works with the isActive check
untypedEditor.options = { override: selectedEditor.editorInfo.id, ...untypedEditor.options };
const handlesDiff = typeof selectedEditor.options?.canHandleDiff === 'function' ? selectedEditor.options.canHandleDiff() : selectedEditor.options?.canHandleDiff;
let handlesDiff = typeof selectedEditor.options?.canHandleDiff === 'function' ? selectedEditor.options.canHandleDiff() : selectedEditor.options?.canHandleDiff;
// Also check that it has a factory function or else it doesn't matter
handlesDiff = handlesDiff && selectedEditor.createDiffEditorInput !== undefined;
if (handlesDiff === false && isResourceDiffEditorInput(untypedEditor)) {
return ResolvedStatus.NONE;
}