From d0c4ea7fca5010e4aa1a7a204bbe4321fb586c87 Mon Sep 17 00:00:00 2001 From: "Ilia.Shulgin" Date: Tue, 26 Nov 2024 12:11:55 +0100 Subject: [PATCH] [git] Put Advanced commit checks order checkbox below checks GitOrigin-RevId: b59beeb50e4f021f5f2ef7f52acf4d3ba354b2c9 --- .../openapi/vcs/configurable/CommitDialogConfigurable.kt | 4 ++-- .../src/com/intellij/vcs/commit/CommitOptionsPanel.kt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogConfigurable.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogConfigurable.kt index 2d749d56d057..e079c603a5f3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogConfigurable.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogConfigurable.kt @@ -90,14 +90,14 @@ class CommitDialogConfigurable(private val project: Project) if (postCommitChecks.isNotEmpty()) { group(CommitOptionsPanel.postCommitChecksGroupTitle(actionName)) { + postCommitChecks.forEach { appendDslConfigurable(it) } + separator() row { checkBox(VcsBundle.message("settings.commit.postpone.slow.checks")) .comment(VcsBundle.message("settings.commit.postpone.slow.checks.description")) .enabledIf(nonModalCommitCheckBox.selected) .bindSelected({ settings.NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS }, { setRunSlowCommitChecksAfterCommit(project, it) }) } - separator() - postCommitChecks.forEach { appendDslConfigurable(it) } } } } diff --git a/platform/vcs-impl/src/com/intellij/vcs/commit/CommitOptionsPanel.kt b/platform/vcs-impl/src/com/intellij/vcs/commit/CommitOptionsPanel.kt index 2e20dcdcfee4..39c422042204 100644 --- a/platform/vcs-impl/src/com/intellij/vcs/commit/CommitOptionsPanel.kt +++ b/platform/vcs-impl/src/com/intellij/vcs/commit/CommitOptionsPanel.kt @@ -68,11 +68,11 @@ internal class CommitOptionsPanel( val postCommitChecks = options.postCommitChecksOptions if (postCommitChecks.isNotEmpty()) { group(postCommitChecksGroupTitle(actionName)) { - if (nonModalCommit) { - appendNonModalCommitSettingsRow(actionName) - separator() - } appendOptionRows(postCommitChecks) + if (nonModalCommit) { + separator() + appendNonModalCommitSettingsRow(actionName) + } } }