Update diffview to latest master

yorickpeterse · yorickpeterse · commit 752aa45e38e8 · 2021-09-07T01:58:32.000+02:00
Injecting winhl overrides is no longer needed, now that sindrets/diffview.nvim#70 is merged.
diff --git a/dotfiles/.config/nvim/lua/dotfiles/abbrev.lua b/dotfiles/.config/nvim/lua/dotfiles/abbrev.lua
@@ -16,5 +16,6 @@ function M.command(cmd, match)
 end
 
 cabbrev('grep', 'silent grep!')
+cabbrev('Review', 'DiffviewOpen')
 
 return M
diff --git a/dotfiles/.config/nvim/lua/dotfiles/commands.lua b/dotfiles/.config/nvim/lua/dotfiles/commands.lua
@@ -1,8 +1,5 @@
 local M = {}
 local fn = vim.fn
-local dv = require('diffview')
-local dv_lib = require('diffview.lib')
-local diff = require('dotfiles.diff')
 
 local function cmd(name, action, flags)
   local flag_pairs = {}
@@ -41,16 +38,6 @@ function M.find_replace_register(find, replace)
   vim.cmd(cmd)
 end
 
-function M.review(rev)
-  dv.open(rev)
-
-  local view = dv_lib.get_current_diffview()
-
-  if view then
-    diff.fix_highlight(view.left_winid, { force = true })
-  end
-end
-
 function M.terminal(cmd)
   vim.cmd(cmd)
   vim.cmd('term')
@@ -65,9 +52,6 @@ cmd(
   { nargs = '+' }
 )
 
--- Git
-cmd('Review', 'lua dotfiles.commands.review(<f-args>)', { nargs = '?' })
-
 -- Terminals
 cmd('Term', 'lua dotfiles.commands.terminal("new")')
 cmd('Vterm', 'lua dotfiles.commands.terminal("vnew")')
diff --git a/dotfiles/.config/nvim/lua/dotfiles/git.lua b/dotfiles/.config/nvim/lua/dotfiles/git.lua
@@ -4,6 +4,7 @@ local cb = require('diffview.config').diffview_callback
 
 require('diffview').setup {
   diff_binaries = false,
+  enhanced_diff_hl = true,
   file_panel = {
     width = 40,
     use_icons = true
@@ -22,6 +23,8 @@ require('diffview').setup {
       ['U'] = cb('unstage_all'),
       ['X'] = cb('restore_entry'),
       ['R'] = cb('refresh_files'),
+      [']f'] = cb('select_next_entry'),
+      ['[f'] = cb('select_prev_entry'),
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ local cb = require('diffview.config').diffview_callback`
`4`	`4`
`5`	`5`	`require('diffview').setup {`
`6`	`6`	`diff_binaries = false,`
	`7`	`+ enhanced_diff_hl = true,`
`7`	`8`	`file_panel = {`
`8`	`9`	`width = 40,`
`9`	`10`	`use_icons = true`
`@@ -22,6 +23,8 @@ require('diffview').setup {`
`22`	`23`	`['U'] = cb('unstage_all'),`
`23`	`24`	`['X'] = cb('restore_entry'),`
`24`	`25`	`['R'] = cb('refresh_files'),`
	`26`	`+ [']f'] = cb('select_next_entry'),`
	`27`	`+ ['[f'] = cb('select_prev_entry'),`
`25`	`28`	`}`
`26`	`29`	`}`
`27`	`30`	`}`