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: non-modal: Disable commit-related actions if commit panel is hidden

Browse Source 
GitOrigin-RevId: 471103bea9e07f52abe0e778d95ff8782faca444
This commit is contained in:
Konstantin Kolosovsky
2019-09-28 17:09:44 +00:00
committed by intellij-monorepo-bot
parent c2857a75a5
commit a2397a44b7
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowCommitOptionsAction.kt
+1 -1
View File
@@ -14,7 +14,7 @@ class ShowCommitOptionsAction : AnAction() {
}
override fun update(e: AnActionEvent) {
e.presentation.isEnabled = e.getProjectCommitWorkflowHandler() != null
e.presentation.isEnabled = e.getProjectCommitWorkflowHandler()?.isActive == true
}
override fun actionPerformed(e: AnActionEvent) {
platform/vcs-impl/src/com/intellij/vcs/commit/AbstractCommitWorkflowHandler.kt
+1 -1
View File
@@ -69,7 +69,7 @@ abstract class AbstractCommitWorkflowHandler<W : AbstractCommitWorkflow, U : Com
fun getCommitActionName() = getDefaultCommitActionName(workflow.vcses)
protected fun createDataProvider() = DataProvider { dataId ->
protected open fun createDataProvider() = DataProvider { dataId ->
when {
COMMIT_WORKFLOW_HANDLER.`is`(dataId) -> this
Refreshable.PANEL_KEY.`is`(dataId) -> commitPanel
platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitPanel.kt
+10 -4
View File
@@ -180,9 +180,7 @@ class ChangesViewCommitPanel(private val changesView: ChangesListView, private v
private fun setupShortcuts(component: JComponent) {
DefaultCommitAction().registerCustomShortcutSet(DEFAULT_COMMIT_ACTION_SHORTCUT, component, this)
DumbAwareAction.create {
if (commitButton.isEnabled) commitButton.showPopup()
}.registerCustomShortcutSet(getDefaultShowPopupShortcut(), component, this)
ShowCustomCommitActions().registerCustomShortcutSet(getDefaultShowPopupShortcut(), component, this)
}
override fun globalSchemeChange(scheme: EditorColorsScheme?) {
@@ -325,9 +323,17 @@ class ChangesViewCommitPanel(private val changesView: ChangesListView, private v
inner class DefaultCommitAction : DumbAwareAction() {
override fun update(e: AnActionEvent) {
e.presentation.isEnabledAndVisible = defaultCommitAction.isEnabled
e.presentation.isEnabledAndVisible = isActive && defaultCommitAction.isEnabled
}
override fun actionPerformed(e: AnActionEvent) = fireDefaultExecutorCalled()
}
private inner class ShowCustomCommitActions : DumbAwareAction() {
override fun update(e: AnActionEvent) {
e.presentation.isEnabledAndVisible = isActive && commitButton.isEnabled
}
override fun actionPerformed(e: AnActionEvent) = commitButton.showPopup()
}
}
platform/vcs-impl/src/com/intellij/vcs/commit/ChangesViewCommitWorkflowHandler.kt
+10 -4
View File
@@ -2,14 +2,12 @@
package com.intellij.vcs.commit
import com.intellij.openapi.Disposable
import com.intellij.openapi.actionSystem.ActionGroup
import com.intellij.openapi.actionSystem.ActionManager
import com.intellij.openapi.actionSystem.AnAction
import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.actionSystem.*
import com.intellij.openapi.util.Disposer
import com.intellij.openapi.vcs.CheckinProjectPanel
import com.intellij.openapi.vcs.FilePath
import com.intellij.openapi.vcs.VcsConfiguration
import com.intellij.openapi.vcs.VcsDataKeys.COMMIT_WORKFLOW_HANDLER
import com.intellij.openapi.vcs.VcsException
import com.intellij.openapi.vcs.changes.*
import com.intellij.openapi.vcs.changes.actions.DefaultCommitExecutorAction
@@ -53,6 +51,14 @@ class ChangesViewCommitWorkflowHandler(
vcsesChanged() // as currently vcses are set before handler subscribes to corresponding event
}
override fun createDataProvider(): DataProvider = object : DataProvider {
private val superProvider = super@ChangesViewCommitWorkflowHandler.createDataProvider()
override fun getData(dataId: String): Any? =
if (COMMIT_WORKFLOW_HANDLER.`is`(dataId)) this@ChangesViewCommitWorkflowHandler.takeIf { it.isActive }
else superProvider.getData(dataId)
}
private fun ensureCommitOptions(): CommitOptions {
if (!areCommitOptionsCreated) {
areCommitOptionsCreated = true