Merge branch 'master' into option-fixes

4 files changed, 166 insertions, 9 deletions

diff --git a/test/functional/ex_cmds/encoding_spec.lua b/test/functional/ex_cmds/encoding_spec.lua
index 0769259be4..7f2bd78a47 100644
--- a/test/functional/ex_cmds/encoding_spec.lua
+++ b/test/functional/ex_cmds/encoding_spec.lua
@@ -15,7 +15,7 @@ describe('&encoding', function()
     feed_command('set encoding=latin1')
     -- error message expected
     feed('<cr>')
-    neq(nil, string.find(eval('v:errmsg'), '^E474:'))
+    neq(nil, string.find(eval('v:errmsg'), '^E519:'))
     eq('utf-8', eval('&encoding'))
     -- check nvim is still in utf-8 mode
     eq(3, eval('strwidth("Bär")'))
@@ -25,7 +25,7 @@ describe('&encoding', function()
     clear('--cmd', 'set enc=latin1')
     -- error message expected
     feed('<cr>')
-    neq(nil, string.find(eval('v:errmsg'), '^E474:'))
+    neq(nil, string.find(eval('v:errmsg'), '^E519:'))
     eq('utf-8', eval('&encoding'))
     eq(3, eval('strwidth("Bär")'))
   end)
diff --git a/test/functional/ex_cmds/mksession_spec.lua b/test/functional/ex_cmds/mksession_spec.lua
new file mode 100644
index 0000000000..5d658f10bb
--- /dev/null
+++ b/test/functional/ex_cmds/mksession_spec.lua
@@ -0,0 +1,49 @@
+local lfs = require('lfs')
+local helpers = require('test.functional.helpers')(after_each)
+
+local clear = helpers.clear
+local command = helpers.command
+local get_pathsep = helpers.get_pathsep
+local eq = helpers.eq
+local funcs = helpers.funcs
+
+local file_prefix = 'Xtest-functional-ex_cmds-mksession_spec'
+
+describe(':mksession', function()
+  local session_file = file_prefix .. '.vim'
+  local tab_dir = file_prefix .. '.d'
+
+  before_each(function()
+    clear()
+    lfs.mkdir(tab_dir)
+  end)
+
+  after_each(function()
+    os.remove(session_file)
+    lfs.rmdir(tab_dir)
+  end)
+
+  it('restores tab-local working directories', function()
+    local tmpfile_base = file_prefix .. '-tmpfile'
+    local cwd_dir = funcs.getcwd()
+
+    -- :mksession does not save empty tabs, so create some buffers.
+    command('edit ' .. tmpfile_base .. '1')
+    command('tabnew')
+    command('edit ' .. tmpfile_base .. '2')
+    command('tcd ' .. tab_dir)
+    command('tabfirst')
+    command('mksession ' .. session_file)
+
+    -- Create a new test instance of Nvim.
+    clear()
+
+    command('source ' .. session_file)
+    -- First tab should have the original working directory.
+    command('tabnext 1')
+    eq(cwd_dir, funcs.getcwd())
+    -- Second tab should have the tab-local working directory.
+    command('tabnext 2')
+    eq(cwd_dir .. get_pathsep() .. tab_dir, funcs.getcwd())
+  end)
+end)
diff --git a/test/functional/ex_cmds/oldfiles_spec.lua b/test/functional/ex_cmds/oldfiles_spec.lua
index 656b3f9bae..4002855c24 100644
--- a/test/functional/ex_cmds/oldfiles_spec.lua
+++ b/test/functional/ex_cmds/oldfiles_spec.lua
@@ -4,13 +4,15 @@ local helpers = require('test.functional.helpers')(after_each)
 local buf, eq, feed_command = helpers.curbufmeths, helpers.eq, helpers.feed_command
 local feed, nvim_prog, wait = helpers.feed, helpers.nvim_prog, helpers.wait
 local ok, set_session, spawn = helpers.ok, helpers.set_session, helpers.spawn
+local eval = helpers.eval
 
-local shada_file = 'test.shada'
+local shada_file = 'Xtest.shada'
 
 local function _clear()
-  set_session(spawn({nvim_prog, '--embed', '-u', 'NONE', '--cmd',
+  set_session(spawn({nvim_prog, '--embed', '-u', 'NONE',
                      -- Need shada for these tests.
-                     'set noswapfile undodir=. directory=. viewdir=. backupdir=. belloff= noshowcmd noruler'}))
+                     '-i', shada_file,
+                     '--cmd', 'set noswapfile undodir=. directory=. viewdir=. backupdir=. belloff= noshowcmd noruler'}))
 end
 
 describe(':oldfiles', function()
@@ -29,8 +31,8 @@ describe(':oldfiles', function()
     screen:attach()
     feed_command('edit testfile1')
     feed_command('edit testfile2')
-    feed_command('wshada ' .. shada_file)
-    feed_command('rshada! ' .. shada_file)
+    feed_command('wshada')
+    feed_command('rshada!')
     local oldfiles = helpers.meths.get_vvar('oldfiles')
     feed_command('oldfiles')
     screen:expect([[
@@ -41,6 +43,38 @@ describe(':oldfiles', function()
       Press ENTER or type command to continue^                                                             |
     ]])
   end)
+
+  it('can be filtered with :filter', function()
+    feed_command('edit file_one.txt')
+    local file1 = buf.get_name()
+    feed_command('edit file_two.txt')
+    local file2 = buf.get_name()
+    feed_command('edit another.txt')
+    local another = buf.get_name()
+    feed_command('wshada')
+    feed_command('rshada!')
+
+    local function get_oldfiles(cmd)
+      local t = eval([[split(execute(']]..cmd..[['), "\n")]])
+      for i, _ in ipairs(t) do
+        t[i] = t[i]:gsub('^%d+:%s+', '')
+      end
+      table.sort(t)
+      return t
+    end
+
+    local oldfiles = get_oldfiles('oldfiles')
+    eq({another, file1, file2}, oldfiles)
+
+    oldfiles = get_oldfiles('filter file_ oldfiles')
+    eq({file1, file2}, oldfiles)
+
+    oldfiles = get_oldfiles('filter /another/ oldfiles')
+    eq({another}, oldfiles)
+
+    oldfiles = get_oldfiles('filter! file_ oldfiles')
+    eq({another}, oldfiles)
+  end)
 end)
 
 describe(':browse oldfiles', function()
@@ -54,10 +88,9 @@ describe(':browse oldfiles', function()
     filename = buf.get_name()
     feed_command('edit testfile2')
     filename2 = buf.get_name()
-    feed_command('wshada ' .. shada_file)
+    feed_command('wshada')
     wait()
     _clear()
-    feed_command('rshada! ' .. shada_file)
 
     -- Ensure nvim is out of "Press ENTER..." prompt.
     feed('<cr>')
diff --git a/test/functional/ex_cmds/script_spec.lua b/test/functional/ex_cmds/script_spec.lua
new file mode 100644
index 0000000000..4e57d2755d
--- /dev/null
+++ b/test/functional/ex_cmds/script_spec.lua
@@ -0,0 +1,75 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local eq = helpers.eq
+local neq = helpers.neq
+local meths = helpers.meths
+local clear = helpers.clear
+local dedent = helpers.dedent
+local source = helpers.source
+local exc_exec = helpers.exc_exec
+local missing_provider = helpers.missing_provider
+
+before_each(clear)
+
+describe('script_get-based command', function()
+  local garbage = ')}{+*({}]*[;(+}{&[]}{*])('
+
+  local function test_garbage_exec(cmd, check_neq)
+    describe(cmd, function()
+      it('works correctly when skipping oneline variant', function()
+        eq(true, pcall(source, (dedent([[
+          if 0
+            %s %s
+          endif
+        ]])):format(cmd, garbage)))
+        eq('', meths.command_output('messages'))
+        if check_neq then
+          neq(0, exc_exec(dedent([[
+            %s %s
+          ]])):format(cmd, garbage))
+        end
+      end)
+      it('works correctly when skipping HEREdoc variant', function()
+        eq(true, pcall(source, (dedent([[
+          if 0
+          %s << EOF
+          %s
+          EOF
+          endif
+        ]])):format(cmd, garbage)))
+        eq('', meths.command_output('messages'))
+        if check_neq then
+          eq(true, pcall(source, (dedent([[
+            let g:exc = 0
+            try
+            %s << EOF
+            %s
+            EOF
+            catch
+            let g:exc = v:exception
+            endtry
+          ]])):format(cmd, garbage)))
+          neq(0, meths.get_var('exc'))
+        end
+      end)
+    end)
+  end
+
+  clear()
+
+  -- Built-in scripts
+  test_garbage_exec('lua', true)
+
+  -- Provider-based scripts
+  test_garbage_exec('ruby', not missing_provider('ruby'))
+  test_garbage_exec('python', not missing_provider('python'))
+  test_garbage_exec('python3', not missing_provider('python3'))
+
+  -- Missing scripts
+  test_garbage_exec('tcl', false)
+  test_garbage_exec('mzscheme', false)
+  test_garbage_exec('perl', false)
+
+  -- Not really a script
+  test_garbage_exec('xxxinvalidlanguagexxx', true)
+end)