Fixed some trailing slash bugs (#957)

* Fixed issue where user would have to trigger dir-up action multiple times to get it to work

* Fix to path_join to ensure the result does not have a double slash
This commit is contained in:
Steve Vermeulen
2022-02-10 07:56:05 +00:00
committed by GitHub
parent b54de4b48a
commit da59247db9
3 changed files with 6 additions and 3 deletions

View File

@@ -1,5 +1,6 @@
local a = vim.api
local lib = function() return require'nvim-tree.lib' end
local utils = require'nvim-tree.utils'
local M = {
current_tab = a.nvim_get_current_tabpage(),
@@ -9,7 +10,7 @@ local M = {
}
function M.fn(name)
local foldername = name == '..' and vim.fn.fnamemodify(TreeExplorer.cwd, ':h') or name
local foldername = name == '..' and vim.fn.fnamemodify(utils.path_remove_trailing(TreeExplorer.cwd), ':h') or name
local no_cwd_change = vim.fn.expand(foldername) == TreeExplorer.cwd
local new_tab = a.nvim_get_current_tabpage()
local is_window = vim.v.event.scope == "window" and new_tab == M.current_tab

View File

@@ -1,10 +1,12 @@
local utils = require'nvim-tree.utils'
local M = {}
function M.fn(node)
if not node or node.name == ".." then
return require'nvim-tree.actions.change-dir'.fn('..')
else
local newdir = vim.fn.fnamemodify(TreeExplorer.cwd, ':h')
local newdir = vim.fn.fnamemodify(utils.path_remove_trailing(TreeExplorer.cwd), ':h')
require'nvim-tree.actions.change-dir'.fn(newdir)
return require"nvim-tree.actions.find-file".fn(node.absolute_path)
end

View File

@@ -29,7 +29,7 @@ end
local path_separator = package.config:sub(1,1)
function M.path_join(paths)
return table.concat(paths, path_separator)
return table.concat(vim.tbl_map(M.path_remove_trailing, paths), path_separator)
end
function M.path_split(path)