Merge pull request #143 from w0rp/better-buffer-cleanup

Stop jobs when buffers close

7 files changed, 156 insertions, 67 deletions

diff --git a/test/test_alelint_autocmd.vader b/test/test_alelint_autocmd.vader
index 86772b61..22fe1935 100644
--- a/test/test_alelint_autocmd.vader
+++ b/test/test_alelint_autocmd.vader
@@ -7,11 +7,14 @@ Before:
 
 After:
   augroup! VaderTest
+  let g:ale_buffer_info = {}
 
 Given vim (Some vimscript):
   set nocompatible
+
 Execute (Lint it):
   call ale#Lint()
   call ale#engine#WaitForJobs(2000)
+
 Then (Autocommands should have run):
   AssertEqual g:success, 1
diff --git a/test/test_cleanup.vader b/test/test_cleanup.vader
index 4f6827f4..ec2b38aa 100644
--- a/test/test_cleanup.vader
+++ b/test/test_cleanup.vader
@@ -1,32 +1,15 @@
 Before:
     let g:buffer = bufnr('%')
-    let g:ale_buffer_count_map = {
-    \ g:buffer: [1, 1],
-    \ 10347: [1, 1],
-    \}
-    let g:ale_buffer_loclist_map = {
-    \ g:buffer : [],
-    \ 10347: [],
-    \}
-    let g:ale_buffer_should_reset_map = {
-    \  g:buffer : 1,
-    \  10347: 1,
-    \}
-    let g:ale_buffer_sign_dummy_map = {
-    \  g:buffer : 1,
-    \  10347: 1,
+
+    let g:ale_buffer_info = {
+    \  g:buffer : {},
+    \  10347: {},
     \}
 
 After:
     unlet! g:buffer
-    let g:ale_buffer_count_map = {}
-    let g:ale_buffer_loclist_map = {}
-    let g:ale_buffer_should_reset_map = {}
-    let g:ale_buffer_sign_dummy_map = {}
+    let g:ale_buffer_info = {}
 
 Execute('ALE globals should be cleared when the buffer is closed.'):
     :q!
-    AssertEqual {10347: [1, 1]}, g:ale_buffer_count_map
-    AssertEqual {10347: []}, g:ale_buffer_loclist_map
-    AssertEqual {10347: 1}, g:ale_buffer_should_reset_map
-    AssertEqual {10347: 1}, g:ale_buffer_sign_dummy_map
+    AssertEqual {10347: {}}, g:ale_buffer_info
diff --git a/test/test_cursor_warnings.vader b/test/test_cursor_warnings.vader
index 364db4bc..b12f2451 100644
--- a/test/test_cursor_warnings.vader
+++ b/test/test_cursor_warnings.vader
@@ -1,17 +1,18 @@
 Before:
-  let g:ale_buffer_loclist_map = {
-  \ bufnr('%'): [
-  \   {
-  \     'lnum': 1,
-  \     'bufnr': bufnr('%'),
-  \     'vcol': 0,
-  \     'linter_name': 'eslint',
-  \     'nr': -1,
-  \     'type': 'E',
-  \     'col': 10,
-  \     'text': 'Missing semicolon. (semi)'
-  \   },
-  \   {
+  let g:ale_buffer_info = {
+  \ bufnr('%'): {
+  \   'loclist': [
+  \     {
+  \       'lnum': 1,
+  \       'bufnr': bufnr('%'),
+  \       'vcol': 0,
+  \       'linter_name': 'eslint',
+  \       'nr': -1,
+  \       'type': 'E',
+  \       'col': 10,
+  \       'text': 'Missing semicolon. (semi)'
+  \     },
+  \     {
   \       'lnum': 2,
   \       'bufnr': bufnr('%'),
   \       'vcol': 0,
@@ -20,8 +21,8 @@ Before:
   \       'type': 'W',
   \       'col': 10,
   \       'text': 'Infix operators must be spaced. (space-infix-ops)'
-  \   },
-  \   {
+  \     },
+  \     {
   \       'lnum': 2,
   \       'bufnr': bufnr('%'),
   \       'vcol': 0,
@@ -30,14 +31,15 @@ Before:
   \       'type': 'E',
   \       'col': 15,
   \       'text': 'Missing radix parameter (radix)'
-  \   }
-  \ ],
+  \     }
+  \   ],
+  \ },
   \}
 
 After:
   unlet! g:output
   unlet! g:lines
-  let g:ale_buffer_loclist_map = {}
+  let g:ale_buffer_info = {}
 
 Given javascript(A Javscript file with warnings/errors):
   var x = 3
diff --git a/test/test_get_loclist.vader b/test/test_get_loclist.vader
new file mode 100644
index 00000000..14696998
--- /dev/null
+++ b/test/test_get_loclist.vader
@@ -0,0 +1,31 @@
+Before:
+  let g:loclist = [
+  \ {
+  \   'lnum': 1,
+  \   'bufnr': bufnr('%'),
+  \   'vcol': 0,
+  \   'linter_name': 'eslint',
+  \   'nr': -1,
+  \   'type': 'E',
+  \   'col': 10,
+  \   'text': 'Missing semicolon. (semi)'
+  \ },
+  \ {
+  \   'lnum': 2,
+  \   'bufnr': bufnr('%'),
+  \   'vcol': 0,
+  \   'linter_name': 'eslint',
+  \   'nr': -1,
+  \   'type': 'W',
+  \   'col': 10,
+  \   'text': 'Infix operators must be spaced. (space-infix-ops)'
+  \ },
+  \]
+  let g:ale_buffer_info = {'1': {'loclist': g:loclist}}
+
+After:
+  unlet g:loclist
+  let g:ale_buffer_info = {}
+
+Execute(GetLoclist should return the loclist):
+  AssertEqual g:loclist, ale#engine#GetLoclist(1)
diff --git a/test/test_linting_sets_signs.vader b/test/test_linting_sets_signs.vader
new file mode 100644
index 00000000..e96e490b
--- /dev/null
+++ b/test/test_linting_sets_signs.vader
@@ -0,0 +1,39 @@
+Given javascript (Some JavaScript with problems):
+  var y = 3+3;
+  var y = 3
+
+Before:
+  sign unplace *
+  let g:actual_sign_list = []
+  let g:expected_sign_list = [
+  \ ['1', 'ALEWarningSign'],
+  \ ['2', 'ALEErrorSign'],
+  \]
+
+  function! g:CollectSigns()
+    redir => l:output
+       silent exec 'sign place'
+    redir END
+
+    for l:line in split(l:output, "\n")
+      let l:match = matchlist(l:line, 'line=\(\d\+\).*name=\(ALE[a-zA-Z]\+\)')
+
+      if len(l:match) > 0
+        call add(g:actual_sign_list, [l:match[1], l:match[2]])
+      endif
+    endfor
+  endfunction
+
+After:
+  sign unplace *
+  let g:ale_buffer_info = {}
+  delfunction g:CollectSigns
+  unlet g:actual_sign_list
+  unlet g:expected_sign_list
+
+Execute(The signs should be updated after linting is done):
+  call ale#Lint()
+  call ale#engine#WaitForJobs(2000)
+  call g:CollectSigns()
+
+  AssertEqual g:expected_sign_list, g:actual_sign_list
diff --git a/test/test_linting_updates_loclist.vader b/test/test_linting_updates_loclist.vader
index 920a4e46..06f11d8b 100644
--- a/test/test_linting_updates_loclist.vader
+++ b/test/test_linting_updates_loclist.vader
@@ -3,15 +3,35 @@ Given javascript (Some JavaScript with problems):
   var y = 3
 
 Before:
-  let g:ale_buffer_loclist_map = {}
-  let g:expected_data = {bufnr('%'): [{'lnum': 1, 'bufnr': bufnr('%'), 'vcol': 0, 'linter_name': 'eslint', 'nr': -1, 'type': 'W', 'col': 10, 'text': 'Infix operators must be spaced. [Warning/space-infix-ops]'}, {'lnum': 2, 'bufnr': bufnr('%'), 'vcol': 0, 'linter_name': 'eslint', 'nr': -1, 'type': 'E', 'col': 10, 'text': 'Missing semicolon. [Error/semi]'}]}
+  let g:expected_data = [
+  \ {
+  \   'lnum': 1,
+  \   'bufnr': bufnr('%'),
+  \   'vcol': 0,
+  \   'linter_name': 'eslint',
+  \   'nr': -1,
+  \   'type': 'W',
+  \   'col': 10,
+  \   'text': 'Infix operators must be spaced. [Warning/space-infix-ops]',
+  \ },
+  \ {
+  \   'lnum': 2,
+  \   'bufnr': bufnr('%'),
+  \   'vcol': 0,
+  \   'linter_name': 'eslint',
+  \   'nr': -1,
+  \   'type': 'E',
+  \   'col': 10,
+  \   'text': 'Missing semicolon. [Error/semi]',
+  \ }
+  \]
 
 After:
-  let g:ale_buffer_loclist_map = {}
   unlet g:expected_data
 
 Execute(The loclist should be updated after linting is done):
   call ale#Lint()
   call ale#engine#WaitForJobs(2000)
 
-  AssertEqual g:expected_data, g:ale_buffer_loclist_map
+  AssertEqual ['' . bufnr('%')], keys(g:ale_buffer_info)
+  AssertEqual g:expected_data, g:ale_buffer_info[bufnr('%')].loclist
diff --git a/test/test_statusline.vader b/test/test_statusline.vader
index da4c693f..05e60479 100644
--- a/test/test_statusline.vader
+++ b/test/test_statusline.vader
@@ -1,49 +1,60 @@
 Before:
-  let g:ale_buffer_loclist_map = {}
+  let g:ale_statusline_format = ['%sE', '%sW', 'OKIE']
+
+After:
+  let g:ale_buffer_info = {}
 
 Execute (Count should be 0 when data is empty):
+  let g:ale_buffer_info = {}
   AssertEqual [0, 0], ale#statusline#Count(bufnr('%'))
 
-Before:
-  let g:ale_buffer_count_map = {'44': [1, 2]}
-
 Execute (Count should read data from the cache):
+  let g:ale_buffer_info = {'44': {'count': [1, 2]}}
   AssertEqual [1, 2], ale#statusline#Count(44)
 
-Execute (Update the cache with new data):
+Execute (The count should be correct after an update):
+  let g:ale_buffer_info = {'44': {}}
   call ale#statusline#Update(44, [])
-
-Then (The cache should reflect the new data):
   AssertEqual [0, 0], ale#statusline#Count(44)
 
-Before:
-  let g:ale_buffer_loclist_map = {'1': [{'lnum': 1, 'bufnr': 1, 'vcol': 0, 'linter_name': 'testlinter', 'nr': -1, 'type': 'E', 'col': 1, 'text': 'Test Error'}]}
-
 Execute (Count should be match the loclist):
-  AssertEqual [1, 0], ale#statusline#Count(1)
+  let g:ale_buffer_info = {
+  \ bufnr('%'): {
+  \   'loclist': [
+  \     {
+  \       'lnum': 1,
+  \       'bufnr': 1,
+  \       'vcol': 0,
+  \       'linter_name': 'testlinter',
+  \       'nr': -1,
+  \       'type': 'E',
+  \       'col': 1,
+  \       'text': 'Test Error',
+  \     },
+  \   ],
+  \ },
+  \}
+  AssertEqual [1, 0], ale#statusline#Count(bufnr('%'))
 
 Execute (Output should be empty for non-existant buffer):
   AssertEqual [0, 0], ale#statusline#Count(9001)
 
-Before:
-  let g:ale_statusline_format = ['%sE', '%sW', 'OKIE']
-
-Execute (Given some errors):
+Execute (Statusline is formatted to the users preference for just errors):
+  let g:ale_buffer_info = {bufnr('%'): {}}
   call ale#statusline#Update(bufnr('%'), [{'type': 'E'}, {'type': 'E'}])
-Then (Statusline is formatted to the users preference):
   AssertEqual '2E', ale#statusline#Status()
 
-Execute (Given some warnings):
+Execute (Statusline is formatted to the users preference for just warnings):
+  let g:ale_buffer_info = {bufnr('%'): {}}
   call ale#statusline#Update(bufnr('%'), [{'type': 'W'}, {'type': 'W'}, {'type': 'W'}])
-Then (Statusline is formatted to the users preference):
   AssertEqual '3W', ale#statusline#Status()
 
-Execute (Given some warnings, and errors):
+Execute (Statusline is formatted to the users preference for errors and warnings):
+  let g:ale_buffer_info = {bufnr('%'): {}}
   call ale#statusline#Update(bufnr('%'), [{'type': 'E'}, {'type': 'W'}, {'type': 'W'}])
-Then (Statusline is formatted to the users preference):
   AssertEqual '1E 2W', ale#statusline#Status()
 
-Execute (Given a lack of data):
+Execute (Statusline is formatted to the users preference for no errors or warnings):
+  let g:ale_buffer_info = {bufnr('%'): {}}
   call ale#statusline#Update(bufnr('%'), [])
-Then (Statusline is formatted to the users preference):
   AssertEqual 'OKIE', ale#statusline#Status()