#2132 - Replace all uses of foo_callback with foo

8 files changed, 15 insertions, 15 deletions

diff --git a/ale_linters/haskell/cabal_ghc.vim b/ale_linters/haskell/cabal_ghc.vim
index 003adf5d..59978e7e 100644
--- a/ale_linters/haskell/cabal_ghc.vim
+++ b/ale_linters/haskell/cabal_ghc.vim
@@ -14,6 +14,6 @@ call ale#linter#Define('haskell', {
 \   'aliases': ['cabal-ghc'],
 \   'output_stream': 'stderr',
 \   'executable': 'cabal',
-\   'command_callback': 'ale_linters#haskell#cabal_ghc#GetCommand',
+\   'command': function('ale_linters#haskell#cabal_ghc#GetCommand'),
 \   'callback': 'ale#handlers#haskell#HandleGHCFormat',
 \})
diff --git a/ale_linters/haskell/ghc.vim b/ale_linters/haskell/ghc.vim
index daf91c8f..9c3906b2 100644
--- a/ale_linters/haskell/ghc.vim
+++ b/ale_linters/haskell/ghc.vim
@@ -13,6 +13,6 @@ call ale#linter#Define('haskell', {
 \   'name': 'ghc',
 \   'output_stream': 'stderr',
 \   'executable': 'ghc',
-\   'command_callback': 'ale_linters#haskell#ghc#GetCommand',
+\   'command': function('ale_linters#haskell#ghc#GetCommand'),
 \   'callback': 'ale#handlers#haskell#HandleGHCFormat',
 \})
diff --git a/ale_linters/haskell/ghc_mod.vim b/ale_linters/haskell/ghc_mod.vim
index 9762be7a..30e96b40 100644
--- a/ale_linters/haskell/ghc_mod.vim
+++ b/ale_linters/haskell/ghc_mod.vim
@@ -13,7 +13,7 @@ endfunction
 call ale#linter#Define('haskell', {
 \   'name': 'ghc_mod',
 \   'aliases': ['ghc-mod'],
-\   'executable_callback': ale#VarFunc('haskell_ghc_mod_executable'),
-\   'command_callback': 'ale_linters#haskell#ghc_mod#GetCommand',
+\   'executable': {b -> ale#Var(b, 'haskell_ghc_mod_executable')},
+\   'command': function('ale_linters#haskell#ghc_mod#GetCommand'),
 \   'callback': 'ale#handlers#haskell#HandleGHCFormat',
 \})
diff --git a/ale_linters/haskell/hdevtools.vim b/ale_linters/haskell/hdevtools.vim
index cc5ce56f..3e55e4f0 100644
--- a/ale_linters/haskell/hdevtools.vim
+++ b/ale_linters/haskell/hdevtools.vim
@@ -14,7 +14,7 @@ endfunction
 
 call ale#linter#Define('haskell', {
 \   'name': 'hdevtools',
-\   'executable_callback': ale#VarFunc('haskell_hdevtools_executable'),
-\   'command_callback': 'ale_linters#haskell#hdevtools#GetCommand',
+\   'executable': {b -> ale#Var(b, 'haskell_hdevtools_executable')},
+\   'command': function('ale_linters#haskell#hdevtools#GetCommand'),
 \   'callback': 'ale#handlers#haskell#HandleGHCFormat',
 \})
diff --git a/ale_linters/haskell/hie.vim b/ale_linters/haskell/hie.vim
index cc85fbed..c4b5f1df 100644
--- a/ale_linters/haskell/hie.vim
+++ b/ale_linters/haskell/hie.vim
@@ -35,7 +35,7 @@ endfunction
 call ale#linter#Define('haskell', {
 \   'name': 'hie',
 \   'lsp': 'stdio',
-\   'command_callback': 'ale_linters#haskell#hie#GetCommand',
-\   'executable_callback': ale#VarFunc('haskell_hie_executable'),
-\   'project_root_callback': 'ale_linters#haskell#hie#GetProjectRoot',
+\   'command': function('ale_linters#haskell#hie#GetCommand'),
+\   'executable': {b -> ale#Var(b, 'haskell_hie_executable')},
+\   'project_root': function('ale_linters#haskell#hie#GetProjectRoot'),
 \})
diff --git a/ale_linters/haskell/hlint.vim b/ale_linters/haskell/hlint.vim
index 0cc7437f..1425251a 100644
--- a/ale_linters/haskell/hlint.vim
+++ b/ale_linters/haskell/hlint.vim
@@ -40,7 +40,7 @@ endfunction
 
 call ale#linter#Define('haskell', {
 \   'name': 'hlint',
-\   'executable_callback': ale#VarFunc('haskell_hlint_executable'),
-\   'command_callback': 'ale_linters#haskell#hlint#GetCommand' ,
+\   'executable': {b -> ale#Var(b, 'haskell_hlint_executable')},
+\   'command': function('ale_linters#haskell#hlint#GetCommand') ,
 \   'callback': 'ale_linters#haskell#hlint#Handle',
 \})
diff --git a/ale_linters/haskell/stack_build.vim b/ale_linters/haskell/stack_build.vim
index 95a54587..8f2d9fd9 100644
--- a/ale_linters/haskell/stack_build.vim
+++ b/ale_linters/haskell/stack_build.vim
@@ -16,8 +16,8 @@ call ale#linter#Define('haskell', {
 \   'name': 'stack_build',
 \   'aliases': ['stack-build'],
 \   'output_stream': 'stderr',
-\   'executable_callback': 'ale#handlers#haskell#GetStackExecutable',
-\   'command_callback': 'ale_linters#haskell#stack_build#GetCommand',
+\   'executable': function('ale#handlers#haskell#GetStackExecutable'),
+\   'command': function('ale_linters#haskell#stack_build#GetCommand'),
 \   'lint_file': 1,
 \   'callback': 'ale#handlers#haskell#HandleGHCFormat',
 \})
diff --git a/ale_linters/haskell/stack_ghc.vim b/ale_linters/haskell/stack_ghc.vim
index 99aa2540..06af7f6d 100644
--- a/ale_linters/haskell/stack_ghc.vim
+++ b/ale_linters/haskell/stack_ghc.vim
@@ -14,7 +14,7 @@ call ale#linter#Define('haskell', {
 \   'name': 'stack_ghc',
 \   'aliases': ['stack-ghc'],
 \   'output_stream': 'stderr',
-\   'executable_callback': 'ale#handlers#haskell#GetStackExecutable',
-\   'command_callback': 'ale_linters#haskell#stack_ghc#GetCommand',
+\   'executable': function('ale#handlers#haskell#GetStackExecutable'),
+\   'command': function('ale_linters#haskell#stack_ghc#GetCommand'),
 \   'callback': 'ale#handlers#haskell#HandleGHCFormat',
 \})