Merge branch 'master' into fix/windows-path-resolution

Author: Uanela

doc/nvim-tree-lua.txt

@@ -349,7 +349,7 @@ The `on_attach` function is passed the `bufnr` of nvim-tree. Use
     vim.keymap.set("n", "<C-e>", api.node.open.replace_tree_buffer,     opts("Open: In Place"))
     ---
     -- OR use all default mappings
-    api.map.on_attach.default.on_attach_default(bufnr)
+    api.map.on_attach.default(bufnr)
 
     -- remove a default
     vim.keymap.del("n", "<C-]>", { buffer = bufnr })
@@ -470,7 +470,7 @@ Alternatively, you may apply these default mappings from your
       return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
     end
 
-    api.map.on_attach.default.on_attach_default(bufnr)
+    api.map.on_attach.default(bufnr)
 
     -- your removals and mappings go here
   end

lua/nvim-tree/renderer/builder.lua

@@ -182,9 +182,9 @@ function Builder:format_line(indent_markers, arrows, icon, name, node)
   for _, d in ipairs(self.decorators) do
     b = d:as(BuiltinDecorator)
     if b then
-      add_to_end(line, b:icons_right_align(node))
+      add_to_end(rights, b:icons_right_align(node))
     elseif api_node then
-      add_to_end(line, d:icons_right_align(api_node))
+      add_to_end(rights, d:icons_right_align(api_node))
     end
   end
   if #rights > 0 then