From cb705f29d10e6544ebd6dcc30b8c061c9fab269f Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Wed, 21 Aug 2024 11:56:23 +0200 Subject: [PATCH] Added stash/pop stash keybinding --- .../gitnuro/keybindings/Keybinding.kt | 16 ++++++++++++++++ .../com/jetpackduba/gitnuro/ui/RepositoryOpen.kt | 8 ++++++++ 2 files changed, 24 insertions(+) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/keybindings/Keybinding.kt b/src/main/kotlin/com/jetpackduba/gitnuro/keybindings/Keybinding.kt index 772108e..43f8c12 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/keybindings/Keybinding.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/keybindings/Keybinding.kt @@ -57,6 +57,16 @@ enum class KeybindingOption { * Used to show branch creation dialog */ BRANCH_CREATE, + + /** + * Used to stash workspace changes + */ + STASH, + + /** + * Used to pop stash changes to workspace + */ + STASH_POP, } @@ -90,6 +100,12 @@ private fun baseKeybindings() = mapOf( KeybindingOption.BRANCH_CREATE to listOf( Keybinding(key = Key.B, control = true), ), + KeybindingOption.STASH to listOf( + Keybinding(key = Key.S, control = true), + ), + KeybindingOption.STASH_POP to listOf( + Keybinding(key = Key.S, control = true, shift = true), + ), ) private fun linuxKeybindings(): Map> = baseKeybindings() diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/RepositoryOpen.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/RepositoryOpen.kt index 208ed0b..28b0bb0 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/RepositoryOpen.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/RepositoryOpen.kt @@ -128,6 +128,14 @@ fun RepositoryOpenPage( false } } + it.matchesBinding(KeybindingOption.STASH) -> { + tabViewModel.stash() + true + } + it.matchesBinding(KeybindingOption.STASH_POP) -> { + tabViewModel.popStash() + true + } else -> false }