tomas.mirchev/nvim-tree.lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#1217 show git status for link targets, when no status on the link itself (#1263)

Browse Source
This commit is contained in:
Alexander Courtis
2022-05-14 17:34:53 +10:00
committed by GitHub
parent 82ec79aac5
commit f85af83f13
4 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lua/nvim-tree/explorer/node-builders.lua
View File

@@ -5,27 +5,13 @@ local M = {
is_windows = vim.fn.has "win32" == 1,
}
function M.get_dir_git_status(parent_ignored, status, absolute_path)
if parent_ignored then
return "!!"
end
local dir_status = status.dirs and status.dirs[absolute_path]
local file_status = status.files and status.files[absolute_path]
return dir_status or file_status
end
function M.get_git_status(parent_ignored, status, absolute_path)
return parent_ignored and "!!" or status.files and status.files[absolute_path]
end
function M.folder(parent, absolute_path, name, status, parent_ignored)
function M.folder(parent, absolute_path, name)
local handle = uv.fs_scandir(absolute_path)
local has_children = handle and uv.fs_scandir_next(handle) ~= nil
return {
absolute_path = absolute_path,
fs_stat = uv.fs_stat(absolute_path),
git_status = M.get_dir_git_status(parent_ignored, status, absolute_path),
group_next = nil, -- If node is grouped, this points to the next child dir/link node
has_children = has_children,
name = name,
@@ -42,7 +28,7 @@ local function is_executable(absolute_path, ext)
return uv.fs_access(absolute_path, "X")
end
function M.file(parent, absolute_path, name, status, parent_ignored)
function M.file(parent, absolute_path, name)
local ext = string.match(name, ".?[^.]+%.(.*)") or ""
return {
@@ -50,7 +36,6 @@ function M.file(parent, absolute_path, name, status, parent_ignored)
executable = is_executable(absolute_path, ext),
extension = ext,
fs_stat = uv.fs_stat(absolute_path),
git_status = M.get_git_status(parent_ignored, status, absolute_path),
name = name,
parent = parent,
}
@@ -61,7 +46,7 @@ end
-- links (for instance libr2.so in /usr/lib) and thus even with a C program realpath fails
-- when it has no real reason to. Maybe there is a reason, but errno is definitely wrong.
-- So we need to check for link_to ~= nil when adding new links to the main tree
function M.link(parent, absolute_path, name, status, parent_ignored)
function M.link(parent, absolute_path, name)
--- I dont know if this is needed, because in my understanding, there isnt hard links in windows, but just to be sure i changed it.
local link_to = uv.fs_realpath(absolute_path)
local open, nodes, has_children
@@ -75,7 +60,6 @@ function M.link(parent, absolute_path, name, status, parent_ignored)
return {
absolute_path = absolute_path,
fs_stat = uv.fs_stat(absolute_path),
git_status = M.get_git_status(parent_ignored, status, absolute_path),
group_next = nil, -- If node is grouped, this points to the next child dir/link node
has_children = has_children,
link_to = link_to,