From 7f3f2b04952902afcceb2017a3e7eaa9e1a999ae Mon Sep 17 00:00:00 2001 From: Nikolay Rykunov Date: Tue, 9 Jun 2020 14:15:51 +0300 Subject: [PATCH] [git] Rebase: Add parameter names to constructor calls GitOrigin-RevId: 22e386aa71ec3e122693b5e9b273e1d667acf5ae --- plugins/git4idea/src/git4idea/rebase/GitRewordAction.kt | 6 +++--- .../src/git4idea/rebase/log/squash/GitSquashLogAction.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/git4idea/src/git4idea/rebase/GitRewordAction.kt b/plugins/git4idea/src/git4idea/rebase/GitRewordAction.kt index 8bce16cc08bb..715123ced557 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRewordAction.kt +++ b/plugins/git4idea/src/git4idea/rebase/GitRewordAction.kt @@ -22,9 +22,9 @@ internal class GitRewordAction : GitSingleCommitEditingAction() { val commit = details.first() val dialog = GitNewCommitMessageActionDialog( commitEditingData, - commit.fullMessage, - GitBundle.getString("rebase.log.reword.dialog.title"), - GitBundle.message( + originMessage = commit.fullMessage, + title = GitBundle.getString("rebase.log.reword.dialog.title"), + dialogLabel = GitBundle.message( "rebase.log.reword.dialog.description.label", commit.id.toShortString(), getShortPresentation(commit.author) diff --git a/plugins/git4idea/src/git4idea/rebase/log/squash/GitSquashLogAction.kt b/plugins/git4idea/src/git4idea/rebase/log/squash/GitSquashLogAction.kt index 72fd8685c507..29521a57810b 100644 --- a/plugins/git4idea/src/git4idea/rebase/log/squash/GitSquashLogAction.kt +++ b/plugins/git4idea/src/git4idea/rebase/log/squash/GitSquashLogAction.kt @@ -21,9 +21,9 @@ internal class GitSquashLogAction : GitMultipleCommitEditingAction() { val selectedCommitDetails = getOrLoadDetails(commitEditingData.project, commitEditingData.logData, commitEditingData.selectedCommitList) val dialog = GitNewCommitMessageActionDialog( commitEditingData, - selectedCommitDetails.joinToString("\n".repeat(3)) { it.fullMessage }, - GitBundle.getString("rebase.log.squash.new.message.dialog.title"), - GitBundle.getString("rebase.log.squash.new.message.dialog.label") + originMessage = selectedCommitDetails.joinToString("\n".repeat(3)) { it.fullMessage }, + title = GitBundle.getString("rebase.log.squash.new.message.dialog.title"), + dialogLabel = GitBundle.getString("rebase.log.squash.new.message.dialog.label") ) dialog.show { newMessage -> squashInBackground(commitEditingData, selectedCommitDetails, newMessage)