Merge branch 'master' into luaviml'/lua

3 files changed, 199 insertions, 18 deletions

diff --git a/test/functional/ex_cmds/dict_notifications_spec.lua b/test/functional/ex_cmds/dict_notifications_spec.lua
index 30753c34ac..e3b4a1c504 100644
--- a/test/functional/ex_cmds/dict_notifications_spec.lua
+++ b/test/functional/ex_cmds/dict_notifications_spec.lua
@@ -9,7 +9,7 @@ local eval = helpers.eval
 describe('dictionary change notifications', function()
   local channel
 
-  setup(function()
+  before_each(function()
     clear()
     channel = nvim('get_api_info')[1]
     nvim('set_var', 'channel', channel)
@@ -18,19 +18,15 @@ describe('dictionary change notifications', function()
   -- the same set of tests are applied to top-level dictionaries(g:, b:, w: and
   -- t:) and a dictionary variable, so we generate them in the following
   -- function.
-  local function gentests(dict_expr, dict_expr_suffix, dict_init)
-    if not dict_expr_suffix then
-      dict_expr_suffix = ''
-    end
-
+  local function gentests(dict_expr, dict_init)
     local function update(opval, key)
       if not key then
         key = 'watched'
       end
       if opval == '' then
-        nvim('command', "unlet "..dict_expr..dict_expr_suffix..key)
+        command(('unlet %s[\'%s\']'):format(dict_expr, key))
       else
-        nvim('command', "let "..dict_expr..dict_expr_suffix..key.." "..opval)
+        command(('let %s[\'%s\'] %s'):format(dict_expr, key, opval))
       end
     end
 
@@ -48,9 +44,9 @@ describe('dictionary change notifications', function()
       eq({'notification', 'values', {key, vals}}, next_msg())
     end
 
-    describe('watcher', function()
+    describe(dict_expr .. ' watcher', function()
       if dict_init then
-        setup(function()
+        before_each(function()
           source(dict_init)
         end)
       end
@@ -58,7 +54,7 @@ describe('dictionary change notifications', function()
       before_each(function()
         source([[
         function! g:Changed(dict, key, value)
-          if a:dict != ]]..dict_expr..[[ |
+          if a:dict isnot ]]..dict_expr..[[ |
             throw 'invalid dict'
           endif
           call rpcnotify(g:channel, 'values', a:key, a:value)
@@ -143,6 +139,32 @@ describe('dictionary change notifications', function()
         ]])
       end)
 
+      it('is triggered for empty keys', function()
+        command([[
+        call dictwatcheradd(]]..dict_expr..[[, "", "g:Changed")
+        ]])
+        update('= 1', '')
+        verify_value({new = 1}, '')
+        update('= 2', '')
+        verify_value({old = 1, new = 2}, '')
+        command([[
+        call dictwatcherdel(]]..dict_expr..[[, "", "g:Changed")
+        ]])
+      end)
+
+      it('is triggered for empty keys when using catch-all *', function()
+        command([[
+        call dictwatcheradd(]]..dict_expr..[[, "*", "g:Changed")
+        ]])
+        update('= 1', '')
+        verify_value({new = 1}, '')
+        update('= 2', '')
+        verify_value({old = 1, new = 2}, '')
+        command([[
+        call dictwatcherdel(]]..dict_expr..[[, "*", "g:Changed")
+        ]])
+      end)
+
       -- test a sequence of updates of different types to ensure proper memory
       -- management(with ASAN)
       local function test_updates(tests)
@@ -190,10 +212,10 @@ describe('dictionary change notifications', function()
   gentests('b:')
   gentests('w:')
   gentests('t:')
-  gentests('g:dict_var', '.', 'let g:dict_var = {}')
+  gentests('g:dict_var', 'let g:dict_var = {}')
 
   describe('multiple watchers on the same dict/key', function()
-    setup(function()
+    before_each(function()
       source([[
       function! g:Watcher1(dict, key, value)
         call rpcnotify(g:channel, '1', a:key, a:value)
@@ -213,13 +235,37 @@ describe('dictionary change notifications', function()
     end)
 
     it('only removes watchers that fully match dict, key and callback', function()
+      nvim('command', 'let g:key = "value"')
+      eq({'notification', '1', {'key', {new = 'value'}}}, next_msg())
+      eq({'notification', '2', {'key', {new = 'value'}}}, next_msg())
       nvim('command', 'call dictwatcherdel(g:, "key", "g:Watcher1")')
       nvim('command', 'let g:key = "v2"')
       eq({'notification', '2', {'key', {old = 'value', new = 'v2'}}}, next_msg())
     end)
   end)
 
+  it('errors out when adding to v:_null_dict', function()
+    command([[
+    function! g:Watcher1(dict, key, value)
+      call rpcnotify(g:channel, '1', a:key, a:value)
+    endfunction
+    ]])
+    eq('Vim(call):E46: Cannot change read-only variable "dictwatcheradd() argument"',
+       exc_exec('call dictwatcheradd(v:_null_dict, "x", "g:Watcher1")'))
+  end)
+
   describe('errors', function()
+    before_each(function()
+      source([[
+      function! g:Watcher1(dict, key, value)
+        call rpcnotify(g:channel, '1', a:key, a:value)
+      endfunction
+      function! g:Watcher2(dict, key, value)
+        call rpcnotify(g:channel, '2', a:key, a:value)
+      endfunction
+      ]])
+    end)
+
     -- WARNING: This suite depends on the above tests
     it('fails to remove if no watcher with matching callback is found', function()
       eq("Vim(call):Couldn't find a watcher matching key and callback",
@@ -236,15 +282,24 @@ describe('dictionary change notifications', function()
       command('call dictwatcherdel(g:, "key", "g:InvalidCb")')
     end)
 
-    it('fails with empty keys', function()
-      eq("Vim(call):E713: Cannot use empty key for Dictionary",
-        exc_exec('call dictwatcheradd(g:, "", "g:Watcher1")'))
-      eq("Vim(call):E713: Cannot use empty key for Dictionary",
-        exc_exec('call dictwatcherdel(g:, "", "g:Watcher1")'))
+    it('fails to remove watcher from v:_null_dict', function()
+      eq("Vim(call):Couldn't find a watcher matching key and callback",
+         exc_exec('call dictwatcherdel(v:_null_dict, "x", "g:Watcher2")'))
     end)
 
+    --[[
+       [ it("fails to add/remove if the callback doesn't exist", function()
+       [   eq("Vim(call):Function g:InvalidCb doesn't exist",
+       [     exc_exec('call dictwatcheradd(g:, "key", "g:InvalidCb")'))
+       [   eq("Vim(call):Function g:InvalidCb doesn't exist",
+       [     exc_exec('call dictwatcherdel(g:, "key", "g:InvalidCb")'))
+       [ end)
+       ]]
+
     it('does not fail to replace a watcher function', function()
       source([[
+      let g:key = 'v2'
+      call dictwatcheradd(g:, "key", "g:Watcher2")
       function! g:ReplaceWatcher2()
         function! g:Watcher2(dict, key, value)
           call rpcnotify(g:channel, '2b', a:key, a:value)
diff --git a/test/functional/ex_cmds/quickfix_commands_spec.lua b/test/functional/ex_cmds/quickfix_commands_spec.lua
new file mode 100644
index 0000000000..5ab34db3fb
--- /dev/null
+++ b/test/functional/ex_cmds/quickfix_commands_spec.lua
@@ -0,0 +1,83 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local eq = helpers.eq
+local clear = helpers.clear
+local funcs = helpers.funcs
+local command = helpers.command
+local exc_exec = helpers.exc_exec
+local write_file = helpers.write_file
+local curbufmeths = helpers.curbufmeths
+
+local file_base = 'Xtest-functional-ex_cmds-quickfix_commands'
+
+before_each(clear)
+
+for _, c in ipairs({'l', 'c'}) do
+  local file = ('%s.%s'):format(file_base, c)
+  local filecmd = c .. 'file'
+  local getfcmd = c .. 'getfile'
+  local addfcmd = c .. 'addfile'
+  local getlist = (c == 'c') and funcs.getqflist or (
+      function() return funcs.getloclist(0) end)
+
+  describe((':%s*file commands'):format(c), function()
+    before_each(function()
+      write_file(file, ([[
+        %s-1.res:700:10:Line 700
+        %s-2.res:800:15:Line 800
+      ]]):format(file, file))
+    end)
+    after_each(function()
+      os.remove(file)
+    end)
+
+    it('work', function()
+      command(('%s %s'):format(filecmd, file))
+      -- Second line of each entry (i.e. `nr=-1, …`) was obtained from actual
+      -- results. First line (i.e. `{lnum=…`) was obtained from legacy test.
+      local list = {
+        {lnum=700, col=10, text='Line 700',
+         nr=-1, bufnr=2, valid=1, pattern='', vcol=0, ['type']=''},
+        {lnum=800, col=15, text='Line 800',
+         nr=-1, bufnr=3, valid=1, pattern='', vcol=0, ['type']=''},
+      }
+      eq(list, getlist())
+      eq(('%s-1.res'):format(file), funcs.bufname(list[1].bufnr))
+      eq(('%s-2.res'):format(file), funcs.bufname(list[2].bufnr))
+
+      -- Run cfile/lfile from a modified buffer
+      command('enew!')
+      curbufmeths.set_lines(1, 1, true, {'Quickfix'})
+      eq(('Vim(%s):E37: No write since last change (add ! to override)'):format(
+          filecmd),
+         exc_exec(('%s %s'):format(filecmd, file)))
+
+      write_file(file, ([[
+        %s-3.res:900:30:Line 900
+      ]]):format(file))
+      command(('%s %s'):format(addfcmd, file))
+      list[#list + 1] = {
+        lnum=900, col=30, text='Line 900',
+        nr=-1, bufnr=5, valid=1, pattern='', vcol=0, ['type']='',
+      }
+      eq(list, getlist())
+      eq(('%s-3.res'):format(file), funcs.bufname(list[3].bufnr))
+
+      write_file(file, ([[
+        %s-1.res:222:77:Line 222
+        %s-2.res:333:88:Line 333
+      ]]):format(file, file))
+      command('enew!')
+      command(('%s %s'):format(getfcmd, file))
+      list = {
+        {lnum=222, col=77, text='Line 222',
+         nr=-1, bufnr=2, valid=1, pattern='', vcol=0, ['type']=''},
+        {lnum=333, col=88, text='Line 333',
+         nr=-1, bufnr=3, valid=1, pattern='', vcol=0, ['type']=''},
+      }
+      eq(list, getlist())
+      eq(('%s-1.res'):format(file), funcs.bufname(list[1].bufnr))
+      eq(('%s-2.res'):format(file), funcs.bufname(list[2].bufnr))
+    end)
+  end)
+end
diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua
index 4ac9f312ef..9c2687971e 100644
--- a/test/functional/ex_cmds/write_spec.lua
+++ b/test/functional/ex_cmds/write_spec.lua
@@ -1,15 +1,28 @@
 local helpers = require('test.functional.helpers')(after_each)
+local lfs = require('lfs')
 local eq, eval, clear, write_file, execute, source, insert =
   helpers.eq, helpers.eval, helpers.clear, helpers.write_file,
   helpers.execute, helpers.source, helpers.insert
+local redir_exec = helpers.redir_exec
+local exc_exec = helpers.exc_exec
+local command = helpers.command
+local funcs = helpers.funcs
+local meths = helpers.meths
 
 if helpers.pending_win32(pending) then return end
 
+local fname = 'Xtest-functional-ex_cmds-write'
+local fname_bak = fname .. '~'
+local fname_broken = fname_bak .. 'broken'
+
 describe(':write', function()
   local function cleanup()
     os.remove('test_bkc_file.txt')
     os.remove('test_bkc_link.txt')
     os.remove('test_fifo')
+    os.remove(fname)
+    os.remove(fname_bak)
+    os.remove(fname_broken)
   end
   before_each(function()
     clear()
@@ -63,4 +76,34 @@ describe(':write', function()
     eq(text.."\n", fifo:read("*all"))
     fifo:close()
   end)
+
+  it('errors out correctly', function()
+    command('let $HOME=""')
+    eq(funcs.fnamemodify('.', ':p:h'), funcs.fnamemodify('.', ':p:h:~'))
+    -- Message from check_overwrite
+    eq(('\nE17: "'..funcs.fnamemodify('.', ':p:h')..'" is a directory'),
+       redir_exec('write .'))
+    meths.set_option('writeany', true)
+    -- Message from buf_write
+    eq(('\nE502: "." is a directory'),
+       redir_exec('write .'))
+    funcs.mkdir(fname_bak)
+    meths.set_option('backupdir', '.')
+    meths.set_option('backup', true)
+    write_file(fname, 'content0')
+    eq(0, exc_exec('edit ' .. fname))
+    funcs.setline(1, 'TTY')
+    eq('Vim(write):E510: Can\'t make backup file (add ! to override)',
+       exc_exec('write'))
+    meths.set_option('backup', false)
+    funcs.setfperm(fname, 'r--------')
+    eq('Vim(write):E505: "Xtest-functional-ex_cmds-write" is read-only (add ! to override)',
+       exc_exec('write'))
+    os.remove(fname)
+    os.remove(fname_bak)
+    write_file(fname_bak, 'TTYX')
+    lfs.link(fname_bak .. ('/xxxxx'):rep(20), fname, true)
+    eq('Vim(write):E166: Can\'t open linked file for writing',
+       exc_exec('write!'))
+  end)
 end)