Merge remote-tracking branch 'upstream/master'

test/fixers/test_astyle_fixer_callback.vader

@@ -0,0 +1,78 @@
+Before:
+  Save g:ale_c_astyle_executable
+  Save g:ale_c_astyle_project_options
+  Save g:ale_cpp_astyle_project_options
+
+  " Use an invalid global executable, so we don't match it.
+  let g:ale_c_astyle_executable = 'xxxinvalid'
+  let g:ale_cpp_astyle_executable = 'invalidpp'
+  let g:ale_c_astyle_project_options = ''
+  let g:ale_cpp_astyle_project_options = ''
+
+  call ale#test#SetDirectory('/testplugin/test/fixers')
+
+After:
+  Restore
+
+  call ale#test#RestoreDirectory()
+
+Execute(The astyle callback should return the correct default values):
+  " Because this file doesn't exist, no astylrc config
+  " exists near it. Therefore, project_options is empty.
+  call ale#test#SetFilename('../c_files/testfile.c')
+
+  AssertEqual
+  \ {
+  \   'command': ale#Escape(g:ale_c_astyle_executable)
+  \     . ' --stdin='
+  \ },
+  \ ale#fixers#astyle#Fix(bufnr(''))
+
+Execute(The astyle callback should support cpp files):
+  " Because this file doesn't exist, no astylrc config
+  " exists near it. Therefore, project_options is empty.
+  call ale#test#SetFilename('../cpp_files/dummy.cpp')
+  set filetype=cpp " The test fails without this
+
+  AssertEqual
+  \ {
+  \   'command': ale#Escape(g:ale_cpp_astyle_executable)
+  \     . ' --stdin='
+  \ },
+  \ ale#fixers#astyle#Fix(bufnr(''))
+
+Execute(The astyle callback should support cpp files with option file set):
+  call ale#test#SetFilename('../cpp_files/dummy.cpp')
+  let g:ale_cpp_astyle_project_options = '.astylerc_cpp'
+  set filetype=cpp " The test fails without this
+
+  AssertEqual
+  \ {
+  \   'command': ale#Escape('invalidpp')
+  \     . ' --project=' . g:ale_cpp_astyle_project_options
+  \     . ' --stdin='
+  \ },
+  \ ale#fixers#astyle#Fix(bufnr(''))
+
+Execute(The astyle callback should return the correct default values with an option file set):
+  call ale#test#SetFilename('../c_files/testfile.c')
+  let g:ale_c_astyle_project_options = '.astylerc_c'
+
+  AssertEqual
+  \ {
+  \   'command': ale#Escape('xxxinvalid')
+  \     . ' --project=' . g:ale_c_astyle_project_options
+  \     . ' --stdin='
+  \ },
+  \ ale#fixers#astyle#Fix(bufnr(''))
+
+Execute(The astyle callback should find nearest default option file _astylrc):
+  call ale#test#SetFilename('../test_c_projects/makefile_project/subdir/file.c')
+
+  AssertEqual
+  \ {
+  \   'command': ale#Escape('xxxinvalid')
+  \     . ' --project=_astylerc'
+  \     . ' --stdin='
+  \ },
+  \ ale#fixers#astyle#Fix(bufnr(''))

test/handler/test_markdownlint_handler.vader

@@ -4,21 +4,74 @@ Before:
 After:
   call ale#linter#Reset()
 
-Execute(The Markdownlint handler should parse output correctly):
+Execute(The Markdownlint handler should parse pre v0.19.0 output with single digit line correctly):
   AssertEqual
   \ [
   \   {
   \     'lnum': 1,
-  \     'text': '(MD002/first-header-h1) First header should be a top level header [Expected: h1; Actual: h2]',
-  \     'type': 'W'
-  \   },
-  \   {
-  \     'lnum': 298,
-  \     'text': '(MD033/no-inline-html) Inline HTML [Element: p]',
+  \     'code': 'MD013/line-length',
+  \     'text': 'Line length [Expected: 80; Actual: 114]',
   \     'type': 'W'
   \   }
   \ ],
   \ ale#handlers#markdownlint#Handle(0, [
-  \ 'README.md: 1: MD002/first-header-h1 First header should be a top level header [Expected: h1; Actual: h2]',
-  \ 'README.md: 298: MD033/no-inline-html Inline HTML [Element: p]'
+  \ 'README.md: 1: MD013/line-length Line length [Expected: 80; Actual: 114]'
+  \ ])
+
+Execute(The Markdownlint handler should parse pre v0.19.0 output with multi digit line correctly):
+  AssertEqual
+  \ [
+  \   {
+  \     'lnum': 100,
+  \     'code': 'MD013/line-length',
+  \     'text': 'Line length [Expected: 80; Actual: 114]',
+  \     'type': 'W'
+  \   }
+  \ ],
+  \ ale#handlers#markdownlint#Handle(0, [
+  \ 'README.md: 100: MD013/line-length Line length [Expected: 80; Actual: 114]'
+  \ ])
+
+Execute(The Markdownlint handler should parse post v0.19.0 output with single digit line correctly):
+  AssertEqual
+  \ [
+  \   {
+  \     'lnum': 1,
+  \     'code': 'MD013/line-length',
+  \     'text': 'Line length [Expected: 80; Actual: 114]',
+  \     'type': 'W'
+  \   }
+  \ ],
+  \ ale#handlers#markdownlint#Handle(0, [
+  \ 'README.md:1 MD013/line-length Line length [Expected: 80; Actual: 114]'
+  \ ])
+
+Execute(The Markdownlint handler should parse post v0.19.0 output with multi digit line correctly):
+  AssertEqual
+  \ [
+  \   {
+  \     'lnum': 100,
+  \     'code': 'MD013/line-length',
+  \     'text': 'Line length [Expected: 80; Actual: 114]',
+  \     'type': 'W'
+  \   }
+  \ ],
+  \ ale#handlers#markdownlint#Handle(0, [
+  \ 'README.md:100 MD013/line-length Line length [Expected: 80; Actual: 114]'
+  \ ])
+
+
+Execute(The Markdownlint handler should parse post v0.22.0 output with column correctly):
+  AssertEqual
+  \ [
+  \   {
+  \     'lnum': 10,
+  \     'col':  20,
+  \     'code': 'MD013/line-length',
+  \     'text': 'Line length [Expected: 80; Actual: 114]',
+  \     'type': 'W'
+  \   }
+  \ ],
+  \ ale#handlers#markdownlint#Handle(0, [
+  \ 'README.md:10:20 MD013/line-length Line length [Expected: 80; Actual: 114]'
   \ ])