Skip to content

Commit 538ad5f

Browse files
authored
Merge branch 'master' into refactor-explorer-actions
2 parents d9124d7 + 3fb91e1 commit 538ad5f

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: checkout
27-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
2828

2929
- name: install lua ${{ matrix.lua_version }}
3030
uses: leafo/gh-actions-lua@v12
@@ -56,7 +56,7 @@ jobs:
5656

5757
steps:
5858
- name: checkout
59-
uses: actions/checkout@v5
59+
uses: actions/checkout@v6
6060

6161
- name: install nvim ${{ matrix.nvim_version }}
6262
uses: rhysd/action-setup-vim@v1

.github/workflows/luarocks-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
luarocks-upload:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
- name: LuaRocks Upload
1515
uses: nvim-neorocks/luarocks-tag-release@v7
1616
env:

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- uses: google-github-actions/release-please-action@v4
1818
id: release
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020
- name: tag major and minor versions
2121
if: ${{ steps.release.outputs.release_created }}
2222
run: |

doc/nvim-tree-lua.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ Use nvim-tree in a floating window.
855855
5.3 OPTS: RENDERER *nvim-tree-opts-renderer*
856856

857857
*nvim-tree.renderer.add_trailing*
858-
Appends a trailing slash to folder names.
858+
Appends a trailing slash to folder and symlink folder destination names.
859859
Type: `boolean`, Default: `false`
860860

861861
*nvim-tree.renderer.group_empty*

lua/nvim-tree/node/directory-link.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ function DirectoryLinkNode:highlighted_name()
6464

6565
if self.explorer.opts.renderer.symlink_destination then
6666
local link_to = utils.path_relative(self.link_to, self.explorer.absolute_path)
67+
if self.explorer.opts.renderer.add_trailing then
68+
link_to = utils.path_add_trailing(link_to)
69+
end
6770

6871
name.str = string.format("%s%s%s", name.str, self.explorer.opts.renderer.icons.symlink_arrow, link_to)
6972
name.hl = { "NvimTreeSymlinkFolderName" }

0 commit comments

Comments
 (0)