Merge pull request #14661 from tjdevries/tjdevries/lua_autocmd_v2

lua: autocmds take 2: electric autoroo

5 files changed, 227 insertions, 2 deletions

diff --git a/test/functional/autocmd/autocmd_oldtest_spec.lua b/test/functional/autocmd/autocmd_oldtest_spec.lua
new file mode 100644
index 0000000000..ad3687d7b0
--- /dev/null
+++ b/test/functional/autocmd/autocmd_oldtest_spec.lua
@@ -0,0 +1,86 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local clear = helpers.clear
+local eq = helpers.eq
+local meths = helpers.meths
+local funcs = helpers.funcs
+
+local exec = function(str)
+  meths.exec(str, false)
+end
+
+describe('oldtests', function()
+  before_each(clear)
+
+  local exec_lines = function(str)
+    return funcs.split(funcs.execute(str), "\n")
+  end
+
+  local add_an_autocmd = function()
+    exec [[
+      augroup vimBarTest
+        au BufReadCmd * echo 'hello'
+      augroup END
+    ]]
+
+    eq(3, #exec_lines('au vimBarTest'))
+    eq(1, #meths.get_autocmds({ group = 'vimBarTest' }))
+  end
+
+  it('should recognize a bar before the {event}', function()
+    -- Good spacing
+    add_an_autocmd()
+    exec [[ augroup vimBarTest | au! | augroup END ]]
+    eq(1, #exec_lines('au vimBarTest'))
+    eq({}, meths.get_autocmds({ group = 'vimBarTest' }))
+
+    -- Sad spacing
+    add_an_autocmd()
+    exec [[ augroup vimBarTest| au!| augroup END ]]
+    eq(1, #exec_lines('au vimBarTest'))
+
+
+    -- test that a bar is recognized after the {event}
+    add_an_autocmd()
+    exec [[ augroup vimBarTest| au!BufReadCmd| augroup END ]]
+    eq(1, #exec_lines('au vimBarTest'))
+
+    add_an_autocmd()
+    exec [[ au! vimBarTest|echo 'hello' ]]
+    eq(1, #exec_lines('au vimBarTest'))
+  end)
+
+  it('should fire on unload buf', function()
+    funcs.writefile({'Test file Xxx1'}, 'Xxx1')
+    funcs.writefile({'Test file Xxx2'}, 'Xxx2')
+
+    local content = [[
+      func UnloadAllBufs()
+        let i = 1
+        while i <= bufnr('$')
+          if i != bufnr('%') && bufloaded(i)
+            exe  i . 'bunload'
+          endif
+          let i += 1
+        endwhile
+      endfunc
+      au BufUnload * call UnloadAllBufs()
+      au VimLeave * call writefile(['Test Finished'], 'Xout')
+      set nohidden
+      edit Xxx1
+      split Xxx2
+      q
+    ]]
+
+    funcs.writefile(funcs.split(content, "\n"), 'Xtest')
+
+    funcs.delete('Xout')
+    funcs.system(meths.get_vvar('progpath') .. ' -u NORC -i NONE -N -S Xtest')
+    eq(1, funcs.filereadable('Xout'))
+
+    funcs.delete('Xxx1')
+    funcs.delete('Xxx2')
+    funcs.delete('Xtest')
+    funcs.delete('Xout')
+  end)
+end)
diff --git a/test/functional/autocmd/autocmd_spec.lua b/test/functional/autocmd/autocmd_spec.lua
index 13d0103ce5..f37f04b32f 100644
--- a/test/functional/autocmd/autocmd_spec.lua
+++ b/test/functional/autocmd/autocmd_spec.lua
@@ -5,6 +5,7 @@ local assert_visible = helpers.assert_visible
 local assert_alive = helpers.assert_alive
 local dedent = helpers.dedent
 local eq = helpers.eq
+local neq = helpers.neq
 local eval = helpers.eval
 local feed = helpers.feed
 local clear = helpers.clear
@@ -418,4 +419,106 @@ describe('autocmd', function()
       :doautocmd SessionLoadPost      |
     ]]}
   end)
+
+  describe('old_tests', function()
+    it('vimscript: WinNew ++once', function()
+      source [[
+        " Without ++once WinNew triggers twice
+        let g:did_split = 0
+        augroup Testing
+          au!
+          au WinNew * let g:did_split += 1
+        augroup END
+        split
+        split
+        call assert_equal(2, g:did_split)
+        call assert_true(exists('#WinNew'))
+        close
+        close
+
+        " With ++once WinNew triggers once
+        let g:did_split = 0
+        augroup Testing
+          au!
+          au WinNew * ++once let g:did_split += 1
+        augroup END
+        split
+        split
+        call assert_equal(1, g:did_split)
+        call assert_false(exists('#WinNew'))
+        close
+        close
+
+        call assert_fails('au WinNew * ++once ++once echo bad', 'E983:')
+      ]]
+
+      meths.set_var('did_split', 0)
+
+      source [[
+        augroup Testing
+          au!
+          au WinNew * let g:did_split += 1
+        augroup END
+
+        split
+        split
+      ]]
+
+      eq(2, meths.get_var('did_split'))
+      eq(1, funcs.exists('#WinNew'))
+
+      -- Now with once
+      meths.set_var('did_split', 0)
+
+      source [[
+        augroup Testing
+          au!
+          au WinNew * ++once let g:did_split += 1
+        augroup END
+
+        split
+        split
+      ]]
+
+      eq(1, meths.get_var('did_split'))
+      eq(0, funcs.exists('#WinNew'))
+
+      -- call assert_fails('au WinNew * ++once ++once echo bad', 'E983:')
+      local ok, msg = pcall(source, [[
+        au WinNew * ++once ++once echo bad
+      ]])
+
+      eq(false, ok)
+      eq(true, not not string.find(msg, 'E983:'))
+    end)
+
+    it('should have autocmds in filetypedetect group', function()
+      source [[filetype on]]
+      neq({}, meths.get_autocmds { group = "filetypedetect" })
+    end)
+
+    it('should not access freed mem', function()
+      source [[
+        au BufEnter,BufLeave,WinEnter,WinLeave 0 vs xxx
+        arg 0
+        argadd
+        all
+        all
+        au!
+        bwipe xxx
+      ]]
+    end)
+
+    it('should allow comma-separated patterns', function()
+      source [[
+        augroup TestingPatterns
+          au!
+          autocmd BufReadCmd *.shada,*.shada.tmp.[a-z] echo 'hello'
+          autocmd BufReadCmd *.shada,*.shada.tmp.[a-z] echo 'hello'
+        augroup END
+      ]]
+
+      eq(4, #meths.get_autocmds { event = "BufReadCmd", group = "TestingPatterns" })
+    end)
+  end)
 end)
diff --git a/test/functional/autocmd/cursormoved_spec.lua b/test/functional/autocmd/cursormoved_spec.lua
index 9641d4b096..85d8628d7e 100644
--- a/test/functional/autocmd/cursormoved_spec.lua
+++ b/test/functional/autocmd/cursormoved_spec.lua
@@ -35,6 +35,7 @@ describe('CursorMoved', function()
   it("is not triggered by cursor movement prior to first CursorMoved instantiation", function()
     source([[
     let g:cursormoved = 0
+    autocmd! CursorMoved
     autocmd CursorMoved * let g:cursormoved += 1
     ]])
     eq(0, eval('g:cursormoved'))
diff --git a/test/functional/autocmd/show_spec.lua b/test/functional/autocmd/show_spec.lua
new file mode 100644
index 0000000000..59757a7d61
--- /dev/null
+++ b/test/functional/autocmd/show_spec.lua
@@ -0,0 +1,35 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local clear = helpers.clear
+local command = helpers.command
+local dedent = helpers.dedent
+local eq = helpers.eq
+local funcs = helpers.funcs
+
+describe(":autocmd", function()
+  before_each(clear)
+
+  it("should not segfault when you just do autocmd", function()
+    command ":autocmd"
+  end)
+
+  it("should filter based on ++once", function()
+    command "autocmd! BufEnter"
+    command "autocmd BufEnter * :echo 'Hello'"
+    command [[augroup TestingOne]]
+    command [[  autocmd BufEnter * :echo "Line 1"]]
+    command [[  autocmd BufEnter * :echo "Line 2"]]
+    command [[augroup END]]
+
+    eq(dedent([[
+
+       --- Autocommands ---
+       BufEnter
+           *         :echo 'Hello'
+       TestingOne  BufEnter
+           *         :echo "Line 1"
+                     :echo "Line 2"]]),
+       funcs.execute('autocmd BufEnter'))
+
+  end)
+end)
diff --git a/test/functional/autocmd/termxx_spec.lua b/test/functional/autocmd/termxx_spec.lua
index 1e8f981437..bc7a6d6c36 100644
--- a/test/functional/autocmd/termxx_spec.lua
+++ b/test/functional/autocmd/termxx_spec.lua
@@ -32,7 +32,7 @@ describe('autocmd TermClose', function()
     retry(nil, nil, function() eq(23, eval('g:test_termclose')) end)
   end)
 
-  it('kills job trapping SIGTERM', function()
+  pending('kills job trapping SIGTERM', function()
     if iswin() then return end
     nvim('set_option', 'shell', 'sh')
     nvim('set_option', 'shellcmdflag', '-c')
@@ -52,7 +52,7 @@ describe('autocmd TermClose', function()
     ok(duration <= 4000)  -- Epsilon for slow CI
   end)
 
-  it('kills PTY job trapping SIGHUP and SIGTERM', function()
+  pending('kills PTY job trapping SIGHUP and SIGTERM', function()
     if iswin() then return end
     nvim('set_option', 'shell', 'sh')
     nvim('set_option', 'shellcmdflag', '-c')