Skip to content

Improve git icons on directories #1809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Dec 17, 2022
Merged

Improve git icons on directories #1809

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5736db5
coding style
chomosuke Nov 29, 2022
cd1df4f
outlined git.show_on_open_dirs behavior
chomosuke Nov 29, 2022
f65dc0d
show some icon on opendir even if show_on_open_dir=false
chomosuke Dec 6, 2022
5c6acd5
fixed renamed icon not showing
chomosuke Dec 6, 2022
75cd0d1
sorted icons
chomosuke Dec 6, 2022
ac8fb08
removed DU from deleted as file will show up in tree
chomosuke Dec 6, 2022
a342de0
fixed update_git_status in reloaders not tested
chomosuke Dec 6, 2022
3af4d14
fixed Api.git.reload()
chomosuke Dec 6, 2022
10fc0eb
sort icon only if not git signcolumn
chomosuke Dec 6, 2022
627dde9
fixed crashing when root dir isn't git dir
chomosuke Dec 7, 2022
bdc2c70
made git.show_on_dirs doc more concise
chomosuke Dec 12, 2022
23d4113
git_statuses -> git_status for consistency
chomosuke Dec 12, 2022
a61763f
explorer/common.lua -> explorer/node.lua
chomosuke Dec 12, 2022
c4b93db
fixed #1784 conflict
chomosuke Dec 13, 2022
23f6276
don't order icons
chomosuke Dec 13, 2022
d5faa8f
Revert "don't order icons"
chomosuke Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed #1784 conflict
  • Loading branch information
@chomosuke
chomosuke committed Dec 13, 2022
commit c4b93dbae9f1f94d5fc837aa80d8205deac4201a
6 changes: 4 additions & 2 deletions lua/nvim-tree/explorer/filters.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,17 @@ local function git(path, git_status)
end

-- default status to clean
local status = git_status.files[path] or git_status.dirs[path] or " "
local status = git_status.files[path]
status = status or git_status.dirs.direct[path] and git_status.dirs.direct[path][1]
status = status or git_status.dirs.indirect[path] and git_status.dirs.indirect[path][1]

-- filter ignored; overrides clean as they are effectively dirty
if M.config.filter_git_ignored and status == "!!" then
return true
end

-- filter clean
if M.config.filter_git_clean and status == " " then
if M.config.filter_git_clean and not status then
return true
end

Expand Down