Merge pull request #16362 from zeertzjq/vim-8.2.3617

vim-patch:8.2.{3468,3617,3618,3622}: some other CWD related patches

4 files changed, 50 insertions, 9 deletions

diff --git a/test/functional/ex_cmds/cd_spec.lua b/test/functional/ex_cmds/cd_spec.lua
index 283fcf9672..f9cce0deb6 100644
--- a/test/functional/ex_cmds/cd_spec.lua
+++ b/test/functional/ex_cmds/cd_spec.lua
@@ -294,7 +294,16 @@ describe("getcwd()", function ()
     command('set autochdir')
     command('edit ' .. directories.global .. '/foo')
     eq(curdir .. pathsep .. directories.global, cwd())
+    eq(curdir, wcwd())
+    call('mkdir', 'bar')
+    command('edit ' .. 'bar/foo')
+    eq(curdir .. pathsep .. directories.global .. pathsep .. 'bar', cwd())
+    eq(curdir, wcwd())
+    command('lcd ..')
+    eq(curdir .. pathsep .. directories.global, cwd())
+    eq(curdir .. pathsep .. directories.global, wcwd())
+    command('edit')
+    eq(curdir .. pathsep .. directories.global .. pathsep .. 'bar', cwd())
+    eq(curdir .. pathsep .. directories.global, wcwd())
   end)
 end)
-
-
diff --git a/test/functional/legacy/autochdir_spec.lua b/test/functional/legacy/autochdir_spec.lua
index 466e3ed830..37a94476a0 100644
--- a/test/functional/legacy/autochdir_spec.lua
+++ b/test/functional/legacy/autochdir_spec.lua
@@ -1,10 +1,11 @@
 local lfs = require('lfs')
 local helpers = require('test.functional.helpers')(after_each)
-local clear, eq = helpers.clear, helpers.eq
-local eval, command = helpers.eval, helpers.command
+local clear, eq, matches = helpers.clear, helpers.eq, helpers.matches
+local eval, command, call = helpers.eval, helpers.command, helpers.call
+local exec_capture = helpers.exec_capture
 
 describe('autochdir behavior', function()
-  local dir = 'Xtest-functional-legacy-autochdir'
+  local dir = 'Xtest_functional_legacy_autochdir'
 
   before_each(function()
     lfs.mkdir(dir)
@@ -23,4 +24,35 @@ describe('autochdir behavior', function()
     eq('Xtest', eval("expand('%')"))
     eq(dir, eval([[substitute(getcwd(), '.*[/\\]\(\k*\)', '\1', '')]]))
   end)
+
+  it(':verbose pwd shows whether autochdir is used', function()
+    local subdir = 'Xautodir'
+    command('cd '..dir)
+    local cwd = eval('getcwd()')
+    command('edit global.txt')
+    matches('%[global%].*'..dir, exec_capture('verbose pwd'))
+    call('mkdir', subdir)
+    command('split '..subdir..'/local.txt')
+    command('lcd '..subdir)
+    matches('%[window%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
+    command('set autochdir')
+    command('wincmd w')
+    matches('%[autochdir%].*'..dir, exec_capture('verbose pwd'))
+    command('lcd '..cwd)
+    matches('%[window%].*'..dir, exec_capture('verbose pwd'))
+    command('tcd '..cwd)
+    matches('%[tabpage%].*'..dir, exec_capture('verbose pwd'))
+    command('cd '..cwd)
+    matches('%[global%].*'..dir, exec_capture('verbose pwd'))
+    command('edit')
+    matches('%[autochdir%].*'..dir, exec_capture('verbose pwd'))
+    command('wincmd w')
+    matches('%[autochdir%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
+    command('set noautochdir')
+    matches('%[autochdir%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
+    command('wincmd w')
+    matches('%[global%].*'..dir, exec_capture('verbose pwd'))
+    command('wincmd w')
+    matches('%[window%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
+  end)
 end)
diff --git a/test/functional/legacy/fnamemodify_spec.lua b/test/functional/legacy/fnamemodify_spec.lua
index 6a5538c26f..6262db3a2f 100644
--- a/test/functional/legacy/fnamemodify_spec.lua
+++ b/test/functional/legacy/fnamemodify_spec.lua
@@ -29,7 +29,7 @@ describe('filename modifiers', function()
         call assert_equal('test.out', fnamemodify('test.out', ':.'))
         call assert_equal('../testdir/a', fnamemodify('../testdir/a', ':.'))
         call assert_equal(fnamemodify(tmpdir, ':~').'/test.out', fnamemodify('test.out', ':~'))
-        call assert_equal('../testdir/a', fnamemodify('../testdir/a', ':~'))
+        call assert_equal(fnamemodify(tmpdir, ':~').'/../testdir/a', fnamemodify('../testdir/a', ':~'))
         call assert_equal('a', fnamemodify('../testdir/a', ':t'))
         call assert_equal('', fnamemodify('.', ':p:t'))
         call assert_equal('test.out', fnamemodify('test.out', ':p:t'))
diff --git a/test/functional/lua/uri_spec.lua b/test/functional/lua/uri_spec.lua
index 81f1820986..dbfbe2dbfe 100644
--- a/test/functional/lua/uri_spec.lua
+++ b/test/functional/lua/uri_spec.lua
@@ -143,8 +143,8 @@ describe('URI methods', function()
       end)
 
       it('uri_to_fname returns non-file scheme URI without authority unchanged', function()
-        eq('zipfile:/path/to/archive.zip%3A%3Afilename.txt', exec_lua [[
-          return vim.uri_to_fname('zipfile:/path/to/archive.zip%3A%3Afilename.txt')
+        eq('zipfile:///path/to/archive.zip%3A%3Afilename.txt', exec_lua [[
+          return vim.uri_to_fname('zipfile:///path/to/archive.zip%3A%3Afilename.txt')
         ]])
       end)
     end)
@@ -186,7 +186,7 @@ describe('URI methods', function()
     end)
 
     it('uri_to_bufnr & uri_from_bufnr returns original uri for non-file uris without authority', function()
-      local uri = 'zipfile:/path/to/archive.zip%3A%3Afilename.txt'
+      local uri = 'zipfile:///path/to/archive.zip%3A%3Afilename.txt'
       local test_case = string.format([[
         local uri = '%s'
         return vim.uri_from_bufnr(vim.uri_to_bufnr(uri))