This commit is contained in:
Logan Ramos 2021-07-21 10:16:41 -04:00
parent 715798221b
commit 8bcc883c6a
No known key found for this signature in database
GPG key ID: D9CCFF14F0B18183

View file

@ -6,7 +6,7 @@
import { ICodeEditor, isCodeEditor, isDiffEditor, isCompositeEditor, getCodeEditor } from 'vs/editor/browser/editorBrowser';
import { CodeEditorServiceImpl } from 'vs/editor/browser/services/codeEditorServiceImpl';
import { ScrollType } from 'vs/editor/common/editorCommon';
import { EditorResolution, IResourceEditorInput } from 'vs/platform/editor/common/editor';
import { IResourceEditorInput } from 'vs/platform/editor/common/editor';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
@ -46,9 +46,6 @@ export class CodeEditorService extends CodeEditorServiceImpl {
async openCodeEditor(input: IResourceEditorInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
// Always use the text editor for code editors
input.options = { ...input.options, override: EditorResolution.EXCLUSIVE_ONLY };
// Special case: If the active editor is a diff editor and the request to open originates and
// targets the modified side of it, we just apply the request there to prevent opening the modified
// side as separate editor.