MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: use DiffEditorTabFilesManager over VcsEditorTabFilesManager

Browse Source 
GitOrigin-RevId: af2bc69b324aacf8f2ca7393275f1cf8d58d74a4
This commit is contained in:
Aleksey Pivovarov
2024-05-24 14:19:48 +02:00
committed by intellij-monorepo-bot
parent bbb73865f7
commit b83a6715ba
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/lvcs-impl/src/com/intellij/platform/lvcs/impl/ui/ActivityView.kt
View File

@@ -1,6 +1,7 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.platform.lvcs.impl.ui
import com.intellij.diff.editor.DiffEditorTabFilesManager
import com.intellij.diff.impl.DiffEditorViewer
import com.intellij.diff.impl.DiffRequestProcessor
import com.intellij.diff.impl.DiffRequestProcessorListener
@@ -23,7 +24,6 @@ import com.intellij.openapi.util.NlsContexts
import com.intellij.openapi.util.registry.Registry
import com.intellij.openapi.vcs.changes.EditorTabDiffPreview
import com.intellij.openapi.vcs.changes.EditorTabDiffPreviewManager
import com.intellij.openapi.vcs.changes.VcsEditorTabFilesManager
import com.intellij.openapi.vcs.changes.ui.TreeHandlerEditorDiffPreview
import com.intellij.openapi.wm.IdeFocusManager
import com.intellij.platform.lvcs.impl.*
@@ -322,7 +322,7 @@ class ActivityView(private val project: Project, gateway: IdeaGateway, val activ
}
val activityView = ActivityView(project, gateway, activityScope)
if (Registry.`is`("lvcs.open.diff.automatically") && !VcsEditorTabFilesManager.getInstance().shouldOpenInNewWindow) {
if (Registry.`is`("lvcs.open.diff.automatically") && DiffEditorTabFilesManager.isDiffInEditor) {
activityView.openDiffWhenLoaded()
}