fix(#388): fix incompatibility with old setups

Author: tanvirtin

README.md

@@ -102,7 +102,7 @@ Enable live blame annotations directly in your editor to see the author and comm
 > Releases prior to the major versions will no longer be maintained.
 > Branch `v1.0.x` contains several new features and massive optimizations but unfortunately also contains several breaking and deprecated changes.
 > For the time being the main branch will still be following `v0.2.x` while core users slowly migrate to `v1.0.x` without breaking their current workflow.
-> New users please use tag `v1.0.3` or branch `v1.0.x` for the latest changes!
+> New users please use tag `v1.0.4` or branch `v1.0.x` for the latest changes!
 
 ---
 
@@ -111,7 +111,7 @@ Using [packer.nvim](https://github.com/wbthomason/packer.nvim)
 ```lua
 use {
   'tanvirtin/vgit.nvim', branch = 'v1.0.x',
-  -- or                , tag = 'v1.0.3',
+  -- or                , tag = 'v1.0.4',
   requires = { 'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons' },
   -- Lazy loading on 'VimEnter' event is necessary.
   event = 'VimEnter',
@@ -124,7 +124,7 @@ Using [lazy.nvim](https://github.com/folke/lazy.nvim)
 ```lua
 {
   'tanvirtin/vgit.nvim', branch = 'v1.0.x',
-   -- or               , tag = 'v1.0.3',
+   -- or               , tag = 'v1.0.4',
   dependencies = { 'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons' },
   -- Lazy loading on 'VimEnter' event is necessary.
   event = 'VimEnter',

lua/vgit/features/screens/DiffScreen/init.lua

@@ -51,16 +51,16 @@ function DiffScreen:create_app_bar_view(scene, model)
       local keymaps = diff_preview_setting:get('keymaps')
       if model:is_staged() then
         return {
-          { keymaps['buffer_unstage'] },
-          { keymaps['buffer_hunk_unstage'] },
-          { 'Switch to Staged View',       keymaps['toggle_view'] },
+          { 'Unstage',               keymaps['buffer_unstage'] },
+          { 'Unstage hunk',          keymaps['buffer_hunk_unstage'] },
+          { 'Switch to Staged View', keymaps['toggle_view'] },
         }
       end
       return {
-        { keymaps['buffer_stage'] },
-        { keymaps['buffer_hunk_stage'] },
-        { keymaps['reset'] },
-        { 'Switch to Unstage View',    keymaps['toggle_view'] },
+        { 'Stage',                  keymaps['buffer_stage'] },
+        { 'Stage hunk',             keymaps['buffer_hunk_stage'] },
+        { 'Reset',                  keymaps['reset'] },
+        { 'Switch to Unstage View', keymaps['toggle_view'] },
       }
     end,
   })

lua/vgit/features/screens/ProjectCommitScreen/init.lua

@@ -21,7 +21,7 @@ function ProjectCommitScreen:constructor(opts)
     app_bar_view = KeyHelpBarView(scene, {
       keymaps = function()
         local keymaps = project_commit_preview_setting:get('keymaps')
-        return { { keymaps['save'] } }
+        return { { 'Save commit', keymaps['save'] } }
       end,
     }),
     view = SimpleView(scene, {

lua/vgit/features/screens/ProjectDiffScreen/init.lua

@@ -28,15 +28,15 @@ function ProjectDiffScreen:constructor(opts)
       keymaps = function()
         local keymaps = project_diff_preview_setting:get('keymaps')
         return {
-          { keymaps['buffer_stage'] },
-          { keymaps['buffer_unstage'] },
-          { keymaps['buffer_reset'] },
-          { keymaps['buffer_hunk_stage'] },
-          { keymaps['buffer_hunk_unstage'] },
-          { keymaps['stage_all'] },
-          { keymaps['unstage_all'] },
-          { keymaps['reset_all'] },
-          { keymaps['commit'] },
+          { 'Stage',        keymaps['buffer_stage'] },
+          { 'Unstage',      keymaps['buffer_unstage'] },
+          { 'Reset',        keymaps['buffer_reset'] },
+          { 'Stage hunk',   keymaps['buffer_hunk_stage'] },
+          { 'Unstage hunk', keymaps['buffer_hunk_unstage'] },
+          { 'Stage all',    keymaps['stage_all'] },
+          { 'Unstage all',  keymaps['unstage_all'] },
+          { 'Reset all',    keymaps['reset_all'] },
+          { 'Commit',       keymaps['commit'] },
         }
       end,
     }),

lua/vgit/features/screens/ProjectStashScreen/init.lua

@@ -25,11 +25,11 @@ function ProjectStashScreen:constructor(opts)
       keymaps = function()
         local keymaps = project_stash_preview_setting:get('keymaps')
         return {
-          { keymaps['add'] },
-          { keymaps['apply'] },
-          { keymaps['pop'] },
-          { keymaps['drop'] },
-          { keymaps['clear'] },
+          { 'Add stash',   keymaps['add'] },
+          { 'Apply stash', keymaps['apply'] },
+          { 'Pop stash',   keymaps['pop'] },
+          { 'Drop stash',  keymaps['drop'] },
+          { 'Clear stash', keymaps['clear'] },
         }
       end,
     }),

lua/vgit/ui/views/KeyHelpBarView.lua

@@ -42,20 +42,12 @@ function KeyHelpBarView:render_help_text(component)
     local key
     local desc
 
-    if #keymap == 1 then
-      local config = keymap[1]
-      key = config.key
-      desc = config.desc
+    if type(keymap[2]) == 'table' then
+      key = keymap[2].key
+      desc = keymap[2].desc
     else
-      if keymap[2] == 'table' then
-        local config = keymap[1]
-        key = config.key
-        desc = keymap[1]
-      else
-        local config = keymap[2]
-        key = config
-        desc = keymap[1]
-      end
+      key = keymap[2]
+      desc = keymap[1]
     end
 
     text = i == 1 and string.format('%s (%s)', desc, key) or string.format('%s | %s (%s)', text, desc, key)