canola.nvim/lua/oil/git.lua
Barrett Ruth 86f553cd0a
build: replace luacheck with selene, add nix devshell and pre-commit (#20)
* build: replace luacheck with selene

Problem: luacheck is unmaintained (last release 2018) and required
suppressing four warning classes to avoid false positives. It also
lacks first-class vim/neovim awareness.

Solution: switch to selene with std='vim' for vim-aware linting.
Replace the luacheck CI job with selene, update the Makefile lint
target, and delete .luacheckrc.

* build: add nix devshell and pre-commit hooks

Problem: oil.nvim had no reproducible dev environment. The .envrc
set up a Python venv for the now-removed docgen pipeline, and there
were no pre-commit hooks for local formatting checks.

Solution: add flake.nix with stylua, selene, and prettier in the
devshell. Replace the stale Python .envrc with 'use flake'. Add
.pre-commit-config.yaml with stylua and prettier hooks matching
other plugins in the repo collection.

* fix: format with stylua

* build(selene): configure lints and add inline suppressions

Problem: selene fails on 5 errors and 3 warnings from upstream code
patterns that are intentional (mixed tables in config API, unused
callback parameters, identical if branches for readability).

Solution: globally allow mixed_table and unused_variable (high volume,
inherent to the codebase design). Add inline selene:allow directives
for the 8 remaining issues: if_same_then_else (4), mismatched_arg_count
(1), empty_if (2), global_usage (1). Remove .envrc from tracking.

* build: switch typecheck action to mrcjkb/lua-typecheck-action

Problem: oil.nvim used stevearc/nvim-typecheck-action, which required
cloning the action repo locally for the Makefile lint target. All
other plugins in the collection use mrcjkb/lua-typecheck-action.

Solution: swap to mrcjkb/lua-typecheck-action@v0 for consistency.
Remove the nvim-typecheck-action git clone from the Makefile and
.gitignore. Drop LuaLS from the local lint target since it requires
a full language server install — CI handles it.
2026-02-21 23:52:27 -05:00

118 lines
2.7 KiB
Lua

-- integration with git operations
local fs = require('oil.fs')
local M = {}
---@param path string
---@return string|nil
M.get_root = function(path)
local git_dir = vim.fs.find('.git', { upward = true, path = path })[1]
if git_dir then
return vim.fs.dirname(git_dir)
else
return nil
end
end
---@param path string
---@param cb fun(err: nil|string)
M.add = function(path, cb)
local root = M.get_root(path)
if not root then
return cb()
end
local stderr = ''
local jid = vim.fn.jobstart({ 'git', 'add', path }, {
cwd = root,
stderr_buffered = true,
on_stderr = function(_, data)
stderr = table.concat(data, '\n')
end,
on_exit = function(_, code)
if code ~= 0 then
cb('Error in git add: ' .. stderr)
else
cb()
end
end,
})
if jid <= 0 then
cb()
end
end
---@param path string
---@param cb fun(err: nil|string)
M.rm = function(path, cb)
local root = M.get_root(path)
if not root then
return cb()
end
local stderr = ''
local jid = vim.fn.jobstart({ 'git', 'rm', '-r', path }, {
cwd = root,
stderr_buffered = true,
on_stderr = function(_, data)
stderr = table.concat(data, '\n')
end,
on_exit = function(_, code)
if code ~= 0 then
stderr = vim.trim(stderr)
if stderr:match("^fatal: pathspec '.*' did not match any files$") then
cb()
else
cb('Error in git rm: ' .. stderr)
end
else
cb()
end
end,
})
if jid <= 0 then
cb()
end
end
---@param entry_type oil.EntryType
---@param src_path string
---@param dest_path string
---@param cb fun(err: nil|string)
M.mv = function(entry_type, src_path, dest_path, cb)
local src_git = M.get_root(src_path)
if not src_git or src_git ~= M.get_root(dest_path) then
fs.recursive_move(entry_type, src_path, dest_path, cb)
return
end
local stderr = ''
local jid = vim.fn.jobstart({ 'git', 'mv', src_path, dest_path }, {
cwd = src_git,
stderr_buffered = true,
on_stderr = function(_, data)
stderr = table.concat(data, '\n')
end,
on_exit = function(_, code)
if code ~= 0 then
stderr = vim.trim(stderr)
if
stderr:match('^fatal: not under version control')
or stderr:match('^fatal: source directory is empty')
then
fs.recursive_move(entry_type, src_path, dest_path, cb)
else
cb('Error in git mv: ' .. stderr)
end
else
cb()
end
end,
})
if jid <= 0 then
-- Failed to run git, fall back to normal filesystem operations
fs.recursive_move(entry_type, src_path, dest_path, cb)
end
end
return M