From ce9cc43f23d749261d63c06e1e330cf49b01f533 Mon Sep 17 00:00:00 2001
From: Barrett Ruth <62671086+barrettruth@users.noreply.github.com>
Date: Fri, 24 Jul 2026 03:45:13 -0700
Subject: [PATCH] fix(dir): open CWD from unnamed buffer with `-` mapping
 #40926

---
 runtime/lua/nvim/dir/fs.lua         |  4 ++++
 test/functional/plugin/dir_spec.lua | 37 +++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/runtime/lua/nvim/dir/fs.lua b/runtime/lua/nvim/dir/fs.lua
index 33aa0b6b60..c244e97691 100644
--- a/runtime/lua/nvim/dir/fs.lua
+++ b/runtime/lua/nvim/dir/fs.lua
@@ -47,6 +47,10 @@ end
 
 ---@param path string
 function M.open_parent_path(path)
+  if path == '' then
+    navigate('.')
+    return
+  end
   path = M.normalize(path)
   navigate(fs.dirname(path), { name = fs.basename(path), dir = vim.fn.isdirectory(path) == 1 })
 end
diff --git a/test/functional/plugin/dir_spec.lua b/test/functional/plugin/dir_spec.lua
index 339ebefda0..0a598e4204 100644
--- a/test/functional/plugin/dir_spec.lua
+++ b/test/functional/plugin/dir_spec.lua
@@ -363,6 +363,43 @@ describe('nvim.dir', function()
     eq('alpha.txt', api.nvim_get_current_line())
   end)
 
+  it('maps - to open the current directory from an unnamed buffer', function()
+    make_fixture()
+    n.clear({ args_rm = { '-u', '--cmd' } })
+    local cwd = fn.getcwd()
+    cd(root)
+    finally(function()
+      cd(cwd)
+    end)
+
+    eq('', api.nvim_buf_get_name(0))
+    feed('-')
+    poke_eventloop()
+
+    assert_directory(root)
+  end)
+
+  it('preserves a modified unnamed buffer when opening the current directory', function()
+    make_fixture()
+    n.clear({ args_rm = { '-u', '--cmd' } })
+    local cwd = fn.getcwd()
+    cd(root)
+    finally(function()
+      cd(cwd)
+    end)
+    local old_buf = api.nvim_get_current_buf()
+    api.nvim_buf_set_lines(old_buf, 0, -1, false, { 'unsaved' })
+
+    feed('-')
+    poke_eventloop()
+
+    assert_directory(root)
+    eq(old_buf, fn.bufnr('#'))
+    eq(true, api.nvim_buf_is_valid(old_buf))
+    eq(true, api.nvim_get_option_value('modified', { buf = old_buf }))
+    eq({ 'unsaved' }, api.nvim_buf_get_lines(old_buf, 0, -1, false))
+  end)
+
   it('does not shadow startup plugin `-` mappings in directory buffers', function()
     make_fixture()
     write_config_plugin(