made the code simpler
This commit is contained in:
parent
3ebfa2412e
commit
4cb019ef4a
1 changed files with 9 additions and 16 deletions
|
|
@ -19,25 +19,18 @@ class BranchNameCheckinHandlerFactory : CheckinHandlerFactory() {
|
||||||
(panel.preferredFocusedComponent)?.addFocusListener(object : FocusAdapter() {
|
(panel.preferredFocusedComponent)?.addFocusListener(object : FocusAdapter() {
|
||||||
override fun focusGained(e: FocusEvent?) {
|
override fun focusGained(e: FocusEvent?) {
|
||||||
// update commit message
|
// update commit message
|
||||||
val currentMessage = panel.commitMessage
|
val message = panel.commitMessage
|
||||||
val modifiedMessage = modifyCommitMessage(currentMessage)
|
val repository = GitRepositoryManager.getInstance(panel.project).repositories.firstOrNull()
|
||||||
panel.commitMessage = modifiedMessage
|
repository?.let {
|
||||||
|
it.currentBranchName?.let { b ->
|
||||||
|
if (!message.startsWith(b)) {
|
||||||
|
panel.commitMessage = "$b $message"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fun modifyCommitMessage(message: String): String {
|
|
||||||
val repository = GitRepositoryManager.getInstance(panel.project).repositories.firstOrNull()
|
|
||||||
|
|
||||||
return repository?.let {
|
|
||||||
val branchName = it.currentBranchName
|
|
||||||
if (branchName != null && !message.startsWith("${branchName} ")) {
|
|
||||||
"${it.currentBranchName ?: ""} ${message}"
|
|
||||||
} else {
|
|
||||||
message
|
|
||||||
}
|
|
||||||
} ?: message
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Add table
Reference in a new issue