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

vcs: remove 'performActionDumbAwareWithCallbacks' usage in SavedPatchesUi

Browse Source 
GitOrigin-RevId: ea951406e044be42f99a8ebe2ff1adbb02fa38f7
This commit is contained in:
Aleksey Pivovarov
2024-03-14 18:34:01 +00:00
committed by intellij-monorepo-bot
parent 9ec33c4dab
commit 474add6b1b
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/savedPatches/SavedPatchesTree.kt
-22
View File
@@ -1,21 +1,14 @@
// 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.openapi.vcs.changes.savedPatches
import com.intellij.ide.DataManager
import com.intellij.ide.util.treeView.TreeState
import com.intellij.openapi.Disposable
import com.intellij.openapi.actionSystem.ActionManager
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.CommonDataKeys
import com.intellij.openapi.actionSystem.IdeActions
import com.intellij.openapi.actionSystem.ex.ActionUtil
import com.intellij.openapi.actionSystem.ex.ActionUtil.performActionDumbAwareWithCallbacks
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.ClearableLazyValue
import com.intellij.openapi.util.Disposer
import com.intellij.openapi.util.TextRange
import com.intellij.openapi.vcs.VcsBundle
import com.intellij.openapi.vcs.changes.savedPatches.SavedPatchesUi.Companion.SAVED_PATCHES_UI_PLACE
import com.intellij.openapi.vcs.changes.ui.*
import com.intellij.openapi.vcs.changes.ui.VcsTreeModelData.allUnder
import com.intellij.ui.SimpleTextAttributes
@@ -24,9 +17,7 @@ import com.intellij.ui.components.panels.Wrapper
import com.intellij.ui.render.RenderingHelper
import com.intellij.ui.speedSearch.SpeedSearchSupply
import com.intellij.ui.speedSearch.SpeedSearchUtil
import com.intellij.util.EditSourceOnDoubleClickHandler
import com.intellij.util.FontUtil
import com.intellij.util.Processor
import com.intellij.util.ui.tree.TreeUtil
import org.jetbrains.annotations.Nls
import java.awt.BorderLayout
@@ -57,19 +48,6 @@ class SavedPatchesTree(project: Project,
setEmptyText(VcsBundle.message("saved.patch.empty.text"))
speedSearch = MySpeedSearch.installOn(this)
doubleClickHandler = Processor { e ->
if (EditSourceOnDoubleClickHandler.isToggleEvent(this, e)) return@Processor false
val diffAction = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_DIFF_COMMON)
val dataContext = DataManager.getInstance().getDataContext(this)
val event = AnActionEvent.createFromAnAction(diffAction, e, SAVED_PATCHES_UI_PLACE, dataContext)
val isEnabled = ActionUtil.lastUpdateAndCheckDumb(diffAction, event, true)
if (isEnabled) performActionDumbAwareWithCallbacks(diffAction, event)
isEnabled
}
savedPatchesProviders.forEach { provider ->
provider.subscribeToPatchesListChanges(parentDisposable) {
if (isProviderVisible(provider)) rebuildTree()
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/savedPatches/SavedPatchesUi.kt
+8
View File
@@ -9,6 +9,8 @@ import com.intellij.openapi.util.Disposer
import com.intellij.openapi.vcs.VcsBundle
import com.intellij.openapi.vcs.changes.EditorTabDiffPreviewManager
import com.intellij.ui.*
import com.intellij.util.EditSourceOnDoubleClickHandler
import com.intellij.util.Processor
import com.intellij.util.containers.orNull
import com.intellij.util.ui.JBUI
import com.intellij.util.ui.ProportionKey
@@ -44,6 +46,12 @@ open class SavedPatchesUi(project: Project,
changesBrowser = SavedPatchesChangesBrowser(project, focusMainUi, this)
CombinedSpeedSearch(changesBrowser.viewer, tree.speedSearch)
tree.doubleClickHandler = Processor { e ->
if (EditSourceOnDoubleClickHandler.isToggleEvent(tree, e)) return@Processor false
changesBrowser.showDiff()
return@Processor true
}
val bottomToolbar = buildBottomToolbar()
tree.addSelectionListener {