MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: do not disable 'Show Diff in Separate Window' option on 'Show All Files in One Diff View' toggle

Browse Source 
GitOrigin-RevId: a52b967bd5eed7c3ccc66376e9c9a7cbf7e7a75c
This commit is contained in:
Aleksey Pivovarov
2024-03-25 15:24:29 +00:00
committed by intellij-monorepo-bot
parent a466f0b37f
commit c992ce6040
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.kt
+9 -1
View File
@@ -43,6 +43,7 @@ import com.intellij.openapi.fileEditor.ex.FileEditorProviderManager
import com.intellij.openapi.fileEditor.ex.FileEditorWithProvider
import com.intellij.openapi.fileEditor.ex.IdeDocumentHistory
import com.intellij.openapi.fileEditor.impl.EditorComposite.Companion.retrofit
import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl.Companion.isSingletonFileEditor
import com.intellij.openapi.fileEditor.impl.text.AsyncEditorLoader
import com.intellij.openapi.fileEditor.impl.text.TEXT_EDITOR_PROVIDER_TYPE_ID
import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider
@@ -2516,7 +2517,14 @@ private fun reopenVirtualFileInEditor(editorManager: FileEditorManagerEx, window
val active = window.selectedComposite == oldComposite
val pinned = window.isFilePinned(oldFile)
var newOptions = FileEditorOpenOptions(selectAsCurrent = active, requestFocus = active, pin = pinned)
if (oldFile == newFile) {
val isSingletonEditor = window.allComposites.any { it.allEditors.any { it.file == oldFile && isSingletonFileEditor(it) } }
val dockContainer = DockManager.getInstance(editorManager.project).getContainerFor(window.component) { it is DockableEditorTabbedContainer }
if (isSingletonEditor && dockContainer != null) {
window.closeFile(oldFile)
editorManager.openFile(newFile, window, newOptions.withOpenMode(FileEditorManagerImpl.OpenMode.NEW_WINDOW))
}
else if (oldFile == newFile) {
val index = window.files.indexOf(oldFile)
newOptions = newOptions.withIndex(index)
window.closeFile(oldFile, disposeIfNeeded = false)