2021-02-23 12:54:04 +00:00
|
|
|
-- Copyright (c) 2020-2021 shadmansaleh
|
|
|
|
-- MIT license, see LICENSE for more details.
|
2021-03-15 23:37:46 +00:00
|
|
|
local utils = require 'lualine.utils.utils'
|
2021-08-09 07:53:42 +00:00
|
|
|
local utils_notices = require('lualine.utils.notices')
|
2021-03-15 23:37:46 +00:00
|
|
|
local highlight = require 'lualine.highlight'
|
2021-08-08 08:47:20 +00:00
|
|
|
local Job = require'lualine.utils.job'
|
2021-02-23 12:54:04 +00:00
|
|
|
|
2021-04-11 08:20:41 +00:00
|
|
|
local Diff = require('lualine.component'):new()
|
|
|
|
|
|
|
|
-- Vars
|
2021-02-23 12:54:04 +00:00
|
|
|
-- variable to store git diff stats
|
2021-04-11 08:20:41 +00:00
|
|
|
Diff.git_diff = nil
|
2021-08-08 08:47:20 +00:00
|
|
|
-- accumulates output from diff process
|
|
|
|
Diff.diff_output_cache = {}
|
|
|
|
-- variable to store git_diff job
|
|
|
|
Diff.diff_job = nil
|
2021-08-09 09:04:15 +00:00
|
|
|
Diff.active_bufnr = '0'
|
2021-04-11 08:20:41 +00:00
|
|
|
-- default colors
|
|
|
|
Diff.default_colors = {
|
|
|
|
added = '#f0e130',
|
|
|
|
removed = '#90ee90',
|
|
|
|
modified = '#ff0038'
|
|
|
|
}
|
|
|
|
|
2021-08-08 16:03:58 +00:00
|
|
|
local diff_cache = {} -- Stores last known value of diff of a buffer
|
|
|
|
|
2021-08-09 07:53:42 +00:00
|
|
|
local function color_deprecation_notice(color, opt_name)
|
|
|
|
utils_notices.add_notice(string.format([[
|
|
|
|
### Diff component
|
|
|
|
Using option `%s` as string to set foreground color has been deprecated
|
|
|
|
and will soon be removed. Now this option has same semantics as regular
|
|
|
|
`color` option for components. Means now you can set bg/fg or both.
|
|
|
|
String value is still valid but it's interpreted differemtly. When a
|
|
|
|
string is used for this option it's treated as a highlight group name.
|
|
|
|
In that case `%s` will be linked to that highlight group.
|
|
|
|
|
|
|
|
You have something like this in your config.
|
|
|
|
|
|
|
|
```lua
|
|
|
|
{'diff',
|
|
|
|
%s = '%s',
|
|
|
|
}
|
|
|
|
```
|
|
|
|
|
|
|
|
You'll have to change it to this to retain previous behavior
|
|
|
|
|
|
|
|
```lua
|
|
|
|
{'diff',
|
|
|
|
%s = { fg = '%s'},
|
|
|
|
}
|
|
|
|
```
|
|
|
|
]], opt_name, opt_name, opt_name, color, opt_name, color))
|
|
|
|
end
|
2021-04-11 08:20:41 +00:00
|
|
|
-- Initializer
|
|
|
|
Diff.new = function(self, options, child)
|
2021-04-20 03:02:21 +00:00
|
|
|
local new_instance = self._parent:new(options, child or Diff)
|
2021-04-11 08:20:41 +00:00
|
|
|
local default_symbols = {added = '+', modified = '~', removed = '-'}
|
2021-04-20 03:02:21 +00:00
|
|
|
new_instance.options.symbols = vim.tbl_extend('force', default_symbols,
|
|
|
|
new_instance.options.symbols or
|
2021-04-11 08:20:41 +00:00
|
|
|
{})
|
2021-04-20 03:02:21 +00:00
|
|
|
if new_instance.options.colored == nil then
|
|
|
|
new_instance.options.colored = true
|
2021-04-11 08:20:41 +00:00
|
|
|
end
|
|
|
|
-- apply colors
|
2021-04-20 03:02:21 +00:00
|
|
|
if not new_instance.options.color_added then
|
2021-08-09 07:53:42 +00:00
|
|
|
new_instance.options.color_added = {fg =
|
|
|
|
utils.extract_highlight_colors('DiffAdd', 'fg') or
|
|
|
|
Diff.default_colors.added}
|
|
|
|
elseif type(new_instance.options.color_added) == 'string'
|
|
|
|
and vim.fn.hlexists(new_instance.options.color_added) == 0 then
|
|
|
|
new_instance.options.color_added = {fg = new_instance.options.color_added}
|
|
|
|
color_deprecation_notice(new_instance.options.color_added.fg, 'color_added')
|
2021-04-11 08:20:41 +00:00
|
|
|
end
|
2021-04-20 03:02:21 +00:00
|
|
|
if not new_instance.options.color_modified then
|
2021-08-09 07:53:42 +00:00
|
|
|
new_instance.options.color_modified = {fg =
|
2021-04-13 12:36:51 +00:00
|
|
|
utils.extract_highlight_colors('DiffChange', 'fg') or
|
2021-08-09 07:53:42 +00:00
|
|
|
Diff.default_colors.modified}
|
|
|
|
elseif type(new_instance.options.color_modified) == 'string'
|
|
|
|
and vim.fn.hlexists(new_instance.options.color_modified) == 0 then
|
|
|
|
new_instance.options.color_modified = {fg = new_instance.options.color_modified}
|
|
|
|
color_deprecation_notice(new_instance.options.color_modified.fg, 'color_modified')
|
2021-04-11 08:20:41 +00:00
|
|
|
end
|
2021-04-20 03:02:21 +00:00
|
|
|
if not new_instance.options.color_removed then
|
2021-08-09 07:53:42 +00:00
|
|
|
new_instance.options.color_removed = {fg =
|
2021-04-13 12:36:51 +00:00
|
|
|
utils.extract_highlight_colors('DiffDelete', 'fg') or
|
2021-08-09 07:53:42 +00:00
|
|
|
Diff.default_colors.removed}
|
|
|
|
elseif type(new_instance.options.color_removed) == 'string'
|
|
|
|
and vim.fn.hlexists(new_instance.options.color_removed) == 0 then
|
|
|
|
new_instance.options.color_removed = {fg = new_instance.options.color_removed}
|
|
|
|
color_deprecation_notice(new_instance.options.color_removed.fg, 'color_removed')
|
2021-04-11 08:20:41 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
-- create highlights and save highlight_name in highlights table
|
2021-04-20 03:02:21 +00:00
|
|
|
if new_instance.options.colored then
|
|
|
|
new_instance.highlights = {
|
2021-04-11 08:20:41 +00:00
|
|
|
added = highlight.create_component_highlight_group(
|
2021-08-09 07:53:42 +00:00
|
|
|
new_instance.options.color_added, 'diff_added',
|
2021-04-20 03:02:21 +00:00
|
|
|
new_instance.options),
|
2021-04-11 08:20:41 +00:00
|
|
|
modified = highlight.create_component_highlight_group(
|
2021-08-09 07:53:42 +00:00
|
|
|
new_instance.options.color_modified, 'diff_modified',
|
2021-04-20 03:02:21 +00:00
|
|
|
new_instance.options),
|
2021-04-11 08:20:41 +00:00
|
|
|
removed = highlight.create_component_highlight_group(
|
2021-08-09 07:53:42 +00:00
|
|
|
new_instance.options.color_removed, 'diff_removed',
|
2021-04-20 03:02:21 +00:00
|
|
|
new_instance.options)
|
2021-04-11 08:20:41 +00:00
|
|
|
}
|
|
|
|
end
|
|
|
|
|
2021-08-03 11:41:37 +00:00
|
|
|
if type(new_instance.options.source) ~= 'function' then
|
|
|
|
-- setup internal source
|
2021-08-08 16:03:58 +00:00
|
|
|
utils.define_autocmd('BufEnter', "lua require'lualine.components.diff'.update_diff_args()")
|
|
|
|
utils.define_autocmd('BufWritePost', "lua require'lualine.components.diff'.update_git_diff()")
|
2021-08-03 11:41:37 +00:00
|
|
|
end
|
2021-08-09 09:04:15 +00:00
|
|
|
Diff.update_diff_args()
|
2021-04-11 08:20:41 +00:00
|
|
|
|
2021-04-20 03:02:21 +00:00
|
|
|
return new_instance
|
2021-04-11 08:20:41 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
-- Function that runs everytime statusline is updated
|
2021-08-08 16:03:58 +00:00
|
|
|
Diff.update_status = function(self, is_focused)
|
2021-08-09 09:04:15 +00:00
|
|
|
if Diff.active_bufnr ~= vim.g.actual_curbuf then
|
|
|
|
-- Workaround for https://github.com/hoob3rt/lualine.nvim/issues/286
|
|
|
|
-- See upstream issue https://github.com/neovim/neovim/issues/15300
|
|
|
|
-- Diff is out of sync re sync it.
|
|
|
|
Diff.update_diff_args()
|
|
|
|
end
|
2021-08-08 16:03:58 +00:00
|
|
|
local git_diff = Diff.git_diff
|
2021-08-03 11:41:37 +00:00
|
|
|
if self.options.source then
|
2021-08-08 16:03:58 +00:00
|
|
|
git_diff = self.options.source()
|
2021-08-03 11:41:37 +00:00
|
|
|
end
|
|
|
|
|
2021-08-08 16:03:58 +00:00
|
|
|
if not is_focused then git_diff = diff_cache[vim.fn.bufnr()] or {} end
|
|
|
|
if git_diff == nil then return '' end
|
2021-04-11 08:20:41 +00:00
|
|
|
|
|
|
|
local colors = {}
|
|
|
|
if self.options.colored then
|
|
|
|
-- load the highlights and store them in colors table
|
|
|
|
for name, highlight_name in pairs(self.highlights) do
|
|
|
|
colors[name] = highlight.component_format_highlight(highlight_name)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
local result = {}
|
|
|
|
-- loop though data and load available sections in result table
|
|
|
|
for _, name in ipairs {'added', 'modified', 'removed'} do
|
2021-08-08 16:03:58 +00:00
|
|
|
if git_diff[name] and git_diff[name] > 0 then
|
2021-04-11 08:20:41 +00:00
|
|
|
if self.options.colored then
|
|
|
|
table.insert(result, colors[name] .. self.options.symbols[name] ..
|
2021-08-08 16:03:58 +00:00
|
|
|
git_diff[name])
|
2021-04-11 08:20:41 +00:00
|
|
|
else
|
2021-08-08 16:03:58 +00:00
|
|
|
table.insert(result, self.options.symbols[name] .. git_diff[name])
|
2021-04-11 08:20:41 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if #result > 0 then
|
|
|
|
return table.concat(result, ' ')
|
|
|
|
else
|
|
|
|
return ''
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
-- Api to get git sign count
|
|
|
|
-- scheme :
|
|
|
|
-- {
|
|
|
|
-- added = added_count,
|
|
|
|
-- modified = modified_count,
|
|
|
|
-- removed = removed_count,
|
|
|
|
-- }
|
|
|
|
-- error_code = { added = -1, modified = -1, removed = -1 }
|
|
|
|
function Diff.get_sign_count()
|
2021-08-08 08:47:20 +00:00
|
|
|
Diff.update_diff_args()
|
2021-04-11 08:20:41 +00:00
|
|
|
Diff.update_git_diff()
|
|
|
|
return Diff.git_diff or {added = -1, modified = -1, removed = -1}
|
|
|
|
end
|
2021-02-23 12:54:04 +00:00
|
|
|
|
2021-03-02 00:10:23 +00:00
|
|
|
-- process diff data and update git_diff{ added, removed, modified }
|
2021-04-11 08:20:41 +00:00
|
|
|
function Diff.process_diff(data)
|
2021-02-23 12:54:04 +00:00
|
|
|
-- Adapted from https://github.com/wbthomason/nvim-vcs.lua
|
|
|
|
local added, removed, modified = 0, 0, 0
|
2021-08-08 08:47:20 +00:00
|
|
|
for _, line in ipairs(data) do
|
2021-02-23 12:54:04 +00:00
|
|
|
if string.find(line, [[^@@ ]]) then
|
2021-03-15 23:37:46 +00:00
|
|
|
local tokens = vim.fn.matchlist(line,
|
|
|
|
[[^@@ -\v(\d+),?(\d*) \+(\d+),?(\d*)]])
|
2021-02-23 12:54:04 +00:00
|
|
|
local line_stats = {
|
|
|
|
mod_count = tokens[3] == '' and 1 or tonumber(tokens[3]),
|
|
|
|
new_count = tokens[5] == '' and 1 or tonumber(tokens[5])
|
|
|
|
}
|
|
|
|
|
|
|
|
if line_stats.mod_count == 0 and line_stats.new_count > 0 then
|
|
|
|
added = added + line_stats.new_count
|
|
|
|
elseif line_stats.mod_count > 0 and line_stats.new_count == 0 then
|
|
|
|
removed = removed + line_stats.mod_count
|
|
|
|
else
|
|
|
|
local min = math.min(line_stats.mod_count, line_stats.new_count)
|
|
|
|
modified = modified + min
|
2021-03-15 23:37:46 +00:00
|
|
|
added = added + line_stats.new_count - min
|
2021-02-23 12:54:04 +00:00
|
|
|
removed = removed + line_stats.mod_count - min
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2021-04-11 08:20:41 +00:00
|
|
|
Diff.git_diff = {added = added, modified = modified, removed = removed}
|
2021-02-23 12:54:04 +00:00
|
|
|
end
|
|
|
|
|
2021-08-08 08:47:20 +00:00
|
|
|
-- Updates the job args
|
|
|
|
function Diff.update_diff_args()
|
2021-02-23 12:54:04 +00:00
|
|
|
-- Donn't show git diff when current buffer doesn't have a filename
|
2021-08-09 09:04:15 +00:00
|
|
|
Diff.active_bufnr = tostring(vim.fn.bufnr())
|
2021-03-15 23:37:46 +00:00
|
|
|
if #vim.fn.expand('%') == 0 then
|
2021-08-08 08:47:20 +00:00
|
|
|
Diff.diff_args = nil;
|
2021-04-11 08:20:41 +00:00
|
|
|
Diff.git_diff = nil;
|
2021-03-15 23:37:46 +00:00
|
|
|
return
|
|
|
|
end
|
2021-08-08 08:47:20 +00:00
|
|
|
Diff.diff_args = {
|
2021-03-15 23:37:46 +00:00
|
|
|
cmd = string.format(
|
|
|
|
[[git -C %s --no-pager diff --no-color --no-ext-diff -U0 -- %s]],
|
|
|
|
vim.fn.expand('%:h'), vim.fn.expand('%:t')),
|
2021-02-23 12:54:04 +00:00
|
|
|
on_stdout = function(_, data)
|
2021-08-08 08:47:20 +00:00
|
|
|
if next(data) then
|
|
|
|
Diff.diff_output_cache = vim.list_extend(Diff.diff_output_cache, data)
|
|
|
|
end
|
2021-02-23 12:54:04 +00:00
|
|
|
end,
|
2021-03-15 23:37:46 +00:00
|
|
|
on_stderr = function(_, data)
|
2021-08-08 08:47:20 +00:00
|
|
|
data = table.concat(data, '\n')
|
|
|
|
if #data > 1 or (#data == 1 and #data[1] > 0) then
|
2021-04-11 08:20:41 +00:00
|
|
|
Diff.git_diff = nil
|
2021-08-08 08:47:20 +00:00
|
|
|
Diff.diff_output_cache = {}
|
2021-02-23 12:54:04 +00:00
|
|
|
end
|
|
|
|
end,
|
|
|
|
on_exit = function()
|
2021-08-08 08:47:20 +00:00
|
|
|
if #Diff.diff_output_cache > 0 then
|
|
|
|
Diff.process_diff(Diff.diff_output_cache)
|
2021-02-24 17:03:24 +00:00
|
|
|
else
|
2021-04-11 08:20:41 +00:00
|
|
|
Diff.git_diff = {added = 0, modified = 0, removed = 0}
|
2021-02-23 12:54:04 +00:00
|
|
|
end
|
2021-08-08 16:03:58 +00:00
|
|
|
diff_cache[vim.fn.bufnr()] = Diff.git_diff
|
2021-02-23 12:54:04 +00:00
|
|
|
end
|
2021-08-08 08:47:20 +00:00
|
|
|
}
|
2021-08-03 06:19:12 +00:00
|
|
|
Diff.update_git_diff()
|
2021-02-23 12:54:04 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
-- Update git_diff veriable
|
2021-04-11 08:20:41 +00:00
|
|
|
function Diff.update_git_diff()
|
2021-08-08 08:47:20 +00:00
|
|
|
if Diff.diff_args then
|
|
|
|
Diff.diff_output_cache = {}
|
|
|
|
if Diff.diff_job then Diff.diff_job:stop() end
|
|
|
|
Diff.diff_job = Job(Diff.diff_args)
|
|
|
|
if Diff.diff_job then Diff.diff_job:start() end
|
2021-08-03 06:19:12 +00:00
|
|
|
end
|
2021-02-23 12:54:04 +00:00
|
|
|
end
|
|
|
|
|
2021-04-11 08:20:41 +00:00
|
|
|
return Diff
|