Merge pull request #17616 from zeertzjq/vim-8.2.3739

vim-patch:8.2.{3739,3745,3920,4060,4513}

src/nvim/testdir/test_autochdir.vim

@@ -26,6 +26,54 @@ func Test_set_filename()
   call delete('samples/Xtest')
 endfunc
 
+func Test_set_filename_other_window()
+  CheckFunction test_autochdir
+  let cwd = getcwd()
+  call test_autochdir()
+  call mkdir('Xa')
+  call mkdir('Xb')
+  call mkdir('Xc')
+  try
+    args Xa/aaa.txt Xb/bbb.txt
+    set acd
+    let winid = win_getid()
+    snext
+    call assert_equal('Xb', substitute(getcwd(), '.*/\([^/]*\)$', '\1', ''))
+    call win_execute(winid, 'file ' .. cwd .. '/Xc/ccc.txt')
+    call assert_equal('Xb', substitute(getcwd(), '.*/\([^/]*\)$', '\1', ''))
+  finally
+    set noacd
+    call chdir(cwd)
+    call delete('Xa', 'rf')
+    call delete('Xb', 'rf')
+    call delete('Xc', 'rf')
+    bwipe! aaa.txt
+    bwipe! bbb.txt
+    bwipe! ccc.txt
+  endtry
+endfunc
+
+func Test_acd_win_execute()
+  CheckFunction test_autochdir
+  let cwd = getcwd()
+  set acd
+  call test_autochdir()
+
+  call mkdir('Xfile')
+  let winid = win_getid()
+  new Xfile/file
+  call assert_match('testdir.Xfile$', getcwd())
+  cd ..
+  call assert_match('testdir$', getcwd())
+  call win_execute(winid, 'echo')
+  call assert_match('testdir$', getcwd())
+
+  bwipe!
+  set noacd
+  call chdir(cwd)
+  call delete('Xfile', 'rf')
+endfunc
+
 func Test_verbose_pwd()
   CheckFunction test_autochdir
   let cwd = getcwd()
@@ -42,20 +90,27 @@ func Test_verbose_pwd()
   set acd
   wincmd w
   call assert_match('\[autochdir\].*testdir$', execute('verbose pwd'))
-  execute 'lcd' cwd
-  call assert_match('\[window\].*testdir$', execute('verbose pwd'))
   execute 'tcd' cwd
   call assert_match('\[tabpage\].*testdir$', execute('verbose pwd'))
   execute 'cd' cwd
   call assert_match('\[global\].*testdir$', execute('verbose pwd'))
+  execute 'lcd' cwd
+  call assert_match('\[window\].*testdir$', execute('verbose pwd'))
   edit
   call assert_match('\[autochdir\].*testdir$', execute('verbose pwd'))
+  enew
+  wincmd w
+  call assert_match('\[autochdir\].*testdir[/\\]Xautodir', execute('verbose pwd'))
+  wincmd w
+  call assert_match('\[window\].*testdir$', execute('verbose pwd'))
   wincmd w
   call assert_match('\[autochdir\].*testdir[/\\]Xautodir', execute('verbose pwd'))
   set noacd
   call assert_match('\[autochdir\].*testdir[/\\]Xautodir', execute('verbose pwd'))
   wincmd w
-  call assert_match('\[global\].*testdir', execute('verbose pwd'))
+  call assert_match('\[window\].*testdir$', execute('verbose pwd'))
+  execute 'cd' cwd
+  call assert_match('\[global\].*testdir$', execute('verbose pwd'))
   wincmd w
   call assert_match('\[window\].*testdir[/\\]Xautodir', execute('verbose pwd'))
 

src/nvim/window.c

@@ -6763,9 +6763,6 @@ void restore_win_noblock(switchwin_T *switchwin, bool no_display)
     curwin = switchwin->sw_curwin;
     curbuf = curwin->w_buffer;
   }
-  // If called by win_execute() and executing the command changed the
-  // directory, it now has to be restored.
-  fix_current_dir();
 }
 
 /// Make "buf" the current buffer.

src/nvim/window.h

@@ -5,6 +5,7 @@
 
 #include "nvim/buffer_defs.h"
 #include "nvim/mark.h"
+#include "nvim/os/os.h"
 
 // Values for file_name_in_line()
 #define FNAME_MESS      1       // give error message
@@ -47,12 +48,36 @@ typedef struct {
   do { \
     win_T *const wp_ = (wp); \
     const pos_T curpos_ = wp_->w_cursor; \
+    char_u cwd_[MAXPATHL]; \
+    char_u autocwd_[MAXPATHL]; \
+    bool apply_acd_ = false; \
+    int cwd_status_ = FAIL; \
+    /* Getting and setting directory can be slow on some systems, only do */ \
+    /* this when the current or target window/tab have a local directory or */ \
+    /* 'acd' is set. */ \
+    if (curwin != wp \
+        && (curwin->w_localdir != NULL || wp->w_localdir != NULL \
+            || (curtab != tp && (curtab->tp_localdir != NULL || tp->tp_localdir != NULL)) \
+            || p_acd)) { \
+      cwd_status_ = os_dirname(cwd_, MAXPATHL); \
+    } \
+    /* If 'acd' is set, check we are using that directory.  If yes, then */ \
+    /* apply 'acd' afterwards, otherwise restore the current directory. */ \
+    if (cwd_status_ == OK && p_acd) { \
+      do_autochdir(); \
+      apply_acd_ = os_dirname(autocwd_, MAXPATHL) == OK && STRCMP(cwd_, autocwd_) == 0; \
+    } \
     switchwin_T switchwin_; \
     if (switch_win_noblock(&switchwin_, wp_, (tp), true) == OK) { \
       check_cursor(); \
       block; \
     } \
     restore_win_noblock(&switchwin_, true); \
+    if (apply_acd_) { \
+      do_autochdir(); \
+    } else if (cwd_status_ == OK) { \
+      os_chdir((char *)cwd_); \
+    } \
     /* Update the status line if the cursor moved. */ \
     if (win_valid(wp_) && !equalpos(curpos_, wp_->w_cursor)) { \
       wp_->w_redr_status = true; \

test/functional/legacy/autochdir_spec.lua

@@ -1,8 +1,12 @@
 local lfs = require('lfs')
 local helpers = require('test.functional.helpers')(after_each)
 local clear, eq, matches = helpers.clear, helpers.eq, helpers.matches
-local eval, command, call = helpers.eval, helpers.command, helpers.call
+local eval, command, call, meths = helpers.eval, helpers.command, helpers.call, helpers.meths
-local exec_capture = helpers.exec_capture
+local source, exec_capture = helpers.source, helpers.exec_capture
+
+local function expected_empty()
+  eq({}, meths.get_vvar('errors'))
+end
 
 describe('autochdir behavior', function()
   local dir = 'Xtest_functional_legacy_autochdir'
@@ -10,19 +14,66 @@ describe('autochdir behavior', function()
   before_each(function()
     lfs.mkdir(dir)
     clear()
+    command('set shellslash')
   end)
 
   after_each(function()
     helpers.rmdir(dir)
   end)
 
-  -- Tests vim/vim/777 without test_autochdir().
+  -- Tests vim/vim#777 without test_autochdir().
   it('sets filename', function()
     command('set acd')
     command('new')
     command('w '..dir..'/Xtest')
     eq('Xtest', eval("expand('%')"))
-    eq(dir, eval([[substitute(getcwd(), '.*[/\\]\(\k*\)', '\1', '')]]))
+    eq(dir, eval([[substitute(getcwd(), '.*/\(\k*\)', '\1', '')]]))
+  end)
+
+  it(':file in win_execute() does not cause wrong directory', function()
+    command('cd '..dir)
+    source([[
+      func Test_set_filename_other_window()
+        let cwd = getcwd()
+        call mkdir('Xa')
+        call mkdir('Xb')
+        call mkdir('Xc')
+        try
+          args Xa/aaa.txt Xb/bbb.txt
+          set acd
+          let winid = win_getid()
+          snext
+          call assert_equal('Xb', substitute(getcwd(), '.*/\([^/]*\)$', '\1', ''))
+          call win_execute(winid, 'file ' .. cwd .. '/Xc/ccc.txt')
+          call assert_equal('Xb', substitute(getcwd(), '.*/\([^/]*\)$', '\1', ''))
+        finally
+          set noacd
+          call chdir(cwd)
+          call delete('Xa', 'rf')
+          call delete('Xb', 'rf')
+          call delete('Xc', 'rf')
+          bwipe! aaa.txt
+          bwipe! bbb.txt
+          bwipe! ccc.txt
+        endtry
+      endfunc
+    ]])
+    call('Test_set_filename_other_window')
+    expected_empty()
+  end)
+
+  it('win_execute() does not change directory', function()
+    local subdir = 'Xfile'
+    command('cd '..dir)
+    command('set acd')
+    call('mkdir', subdir)
+    local winid = eval('win_getid()')
+    command('new '..subdir..'/file')
+    matches(dir..'/'..subdir..'$', eval('getcwd()'))
+    command('cd ..')
+    matches(dir..'$', eval('getcwd()'))
+    call('win_execute', winid, 'echo')
+    matches(dir..'$', eval('getcwd()'))
   end)
 
   it(':verbose pwd shows whether autochdir is used', function()
@@ -30,29 +81,36 @@ describe('autochdir behavior', function()
     command('cd '..dir)
     local cwd = eval('getcwd()')
     command('edit global.txt')
-    matches('%[global%].*'..dir, exec_capture('verbose pwd'))
+    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'))
+    matches('%[window%].*'..dir..'/'..subdir..'$', exec_capture('verbose pwd'))
-    command('set autochdir')
+    command('set acd')
     command('wincmd w')
-    matches('%[autochdir%].*'..dir, exec_capture('verbose pwd'))
+    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'))
+    matches('%[tabpage%].*'..dir..'$', exec_capture('verbose pwd'))
     command('cd '..cwd)
-    matches('%[global%].*'..dir, exec_capture('verbose pwd'))
+    matches('%[global%].*'..dir..'$', exec_capture('verbose pwd'))
+    command('lcd '..cwd)
+    matches('%[window%].*'..dir..'$', exec_capture('verbose pwd'))
     command('edit')
-    matches('%[autochdir%].*'..dir, exec_capture('verbose pwd'))
+    matches('%[autochdir%].*'..dir..'$', exec_capture('verbose pwd'))
+    command('enew')
     command('wincmd w')
-    matches('%[autochdir%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
+    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'))
+    matches('%[window%].*'..dir..'$', exec_capture('verbose pwd'))
     command('wincmd w')
-    matches('%[window%].*'..dir..'[/\\]'..subdir, exec_capture('verbose pwd'))
+    matches('%[autochdir%].*'..dir..'/'..subdir..'$', exec_capture('verbose pwd'))
+    command('set noacd')
+    matches('%[autochdir%].*'..dir..'/'..subdir..'$', exec_capture('verbose pwd'))
+    command('wincmd w')
+    matches('%[window%].*'..dir..'$', exec_capture('verbose pwd'))
+    command('cd '..cwd)
+    matches('%[global%].*'..dir..'$', exec_capture('verbose pwd'))
+    command('wincmd w')
+    matches('%[window%].*'..dir..'/'..subdir..'$', exec_capture('verbose pwd'))
   end)
 end)

test/functional/options/autochdir_spec.lua

@@ -1,7 +1,9 @@
+local lfs = require('lfs')
 local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
-local getcwd = helpers.funcs.getcwd
+local funcs = helpers.funcs
+local command = helpers.command
 
 describe("'autochdir'", function()
   it('given on the shell gets processed properly', function()
@@ -9,11 +11,34 @@ describe("'autochdir'", function()
 
     -- By default 'autochdir' is off, thus getcwd() returns the repo root.
     clear(targetdir..'/tty-test.c')
-    local rootdir = getcwd()
+    local rootdir = funcs.getcwd()
     local expected = rootdir .. '/' .. targetdir
 
     -- With 'autochdir' on, we should get the directory of tty-test.c.
     clear('--cmd', 'set autochdir', targetdir..'/tty-test.c')
-    eq(helpers.iswin() and expected:gsub('/', '\\') or expected, getcwd())
+    eq(helpers.iswin() and expected:gsub('/', '\\') or expected, funcs.getcwd())
+  end)
+
+  it('is not overwritten by getwinvar() call #17609',function()
+    local curdir = string.gsub(lfs.currentdir(), '\\', '/')
+    local dir_a = curdir..'/Xtest-functional-options-autochdir.dir_a'
+    local dir_b = curdir..'/Xtest-functional-options-autochdir.dir_b'
+    lfs.mkdir(dir_a)
+    lfs.mkdir(dir_b)
+    clear()
+    command('set shellslash')
+    command('set autochdir')
+    command('edit '..dir_a..'/file1')
+    eq(dir_a, funcs.getcwd())
+    command('lcd '..dir_b)
+    eq(dir_b, funcs.getcwd())
+    command('botright vnew ../file2')
+    eq(curdir, funcs.getcwd())
+    command('wincmd w')
+    eq(dir_a, funcs.getcwd())
+    funcs.getwinvar(2, 'foo')
+    eq(dir_a, funcs.getcwd())
+    helpers.rmdir(dir_a)
+    helpers.rmdir(dir_b)
   end)
 end)