#2132 - Replace all uses of foo_callback with foo

8 files changed, 17 insertions, 17 deletions

diff --git a/ale_linters/c/ccls.vim b/ale_linters/c/ccls.vim
index 5dc2339f..9e3dafe9 100644
--- a/ale_linters/c/ccls.vim
+++ b/ale_linters/c/ccls.vim
@@ -7,8 +7,8 @@ call ale#Set('c_ccls_init_options', {})
 call ale#linter#Define('c', {
 \   'name': 'ccls',
 \   'lsp': 'stdio',
-\   'executable_callback': ale#VarFunc('c_ccls_executable'),
+\   'executable': {b -> ale#Var(b, 'c_ccls_executable')},
 \   'command': '%e',
-\   'project_root_callback': 'ale#handlers#ccls#GetProjectRoot',
-\   'initialization_options_callback':ale#VarFunc('c_ccls_init_options'),
+\   'project_root': function('ale#handlers#ccls#GetProjectRoot'),
+\   'initialization_options': {b -> ale#Var(b, 'c_ccls_init_options')},
 \})
diff --git a/ale_linters/c/clang.vim b/ale_linters/c/clang.vim
index f1bd675b..5b243bfe 100644
--- a/ale_linters/c/clang.vim
+++ b/ale_linters/c/clang.vim
@@ -18,7 +18,7 @@ endfunction
 call ale#linter#Define('c', {
 \   'name': 'clang',
 \   'output_stream': 'stderr',
-\   'executable_callback': ale#VarFunc('c_clang_executable'),
+\   'executable': {b -> ale#Var(b, 'c_clang_executable')},
 \   'command_chain': [
 \       {'callback': 'ale#c#GetMakeCommand', 'output_stream': 'stdout'},
 \       {'callback': 'ale_linters#c#clang#GetCommand'}
diff --git a/ale_linters/c/clangd.vim b/ale_linters/c/clangd.vim
index 6cad601a..918eadcc 100644
--- a/ale_linters/c/clangd.vim
+++ b/ale_linters/c/clangd.vim
@@ -17,7 +17,7 @@ endfunction
 call ale#linter#Define('c', {
 \   'name': 'clangd',
 \   'lsp': 'stdio',
-\   'executable_callback': ale#VarFunc('c_clangd_executable'),
-\   'command_callback': 'ale_linters#c#clangd#GetCommand',
-\   'project_root_callback': 'ale_linters#c#clangd#GetProjectRoot',
+\   'executable': {b -> ale#Var(b, 'c_clangd_executable')},
+\   'command': function('ale_linters#c#clangd#GetCommand'),
+\   'project_root': function('ale_linters#c#clangd#GetProjectRoot'),
 \})
diff --git a/ale_linters/c/clangtidy.vim b/ale_linters/c/clangtidy.vim
index 4f334655..6484f8af 100644
--- a/ale_linters/c/clangtidy.vim
+++ b/ale_linters/c/clangtidy.vim
@@ -35,8 +35,8 @@ endfunction
 call ale#linter#Define('c', {
 \   'name': 'clangtidy',
 \   'output_stream': 'stdout',
-\   'executable_callback': ale#VarFunc('c_clangtidy_executable'),
-\   'command_callback': 'ale_linters#c#clangtidy#GetCommand',
+\   'executable': {b -> ale#Var(b, 'c_clangtidy_executable')},
+\   'command': function('ale_linters#c#clangtidy#GetCommand'),
 \   'callback': 'ale#handlers#gcc#HandleGCCFormat',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/c/cppcheck.vim b/ale_linters/c/cppcheck.vim
index 5e8c7936..851f9f11 100644
--- a/ale_linters/c/cppcheck.vim
+++ b/ale_linters/c/cppcheck.vim
@@ -28,7 +28,7 @@ endfunction
 call ale#linter#Define('c', {
 \   'name': 'cppcheck',
 \   'output_stream': 'both',
-\   'executable_callback': ale#VarFunc('c_cppcheck_executable'),
-\   'command_callback': 'ale_linters#c#cppcheck#GetCommand',
+\   'executable': {b -> ale#Var(b, 'c_cppcheck_executable')},
+\   'command': function('ale_linters#c#cppcheck#GetCommand'),
 \   'callback': 'ale#handlers#cppcheck#HandleCppCheckFormat',
 \})
diff --git a/ale_linters/c/cquery.vim b/ale_linters/c/cquery.vim
index a20782a2..d2be9cd9 100644
--- a/ale_linters/c/cquery.vim
+++ b/ale_linters/c/cquery.vim
@@ -21,8 +21,8 @@ endfunction
 call ale#linter#Define('c', {
 \   'name': 'cquery',
 \   'lsp': 'stdio',
-\   'executable_callback': ale#VarFunc('c_cquery_executable'),
+\   'executable': {b -> ale#Var(b, 'c_cquery_executable')},
 \   'command': '%e',
-\   'project_root_callback': 'ale_linters#c#cquery#GetProjectRoot',
-\   'initialization_options_callback': 'ale_linters#c#cquery#GetInitializationOptions',
+\   'project_root': function('ale_linters#c#cquery#GetProjectRoot'),
+\   'initialization_options': function('ale_linters#c#cquery#GetInitializationOptions'),
 \})
diff --git a/ale_linters/c/flawfinder.vim b/ale_linters/c/flawfinder.vim
index 94104141..53c36716 100644
--- a/ale_linters/c/flawfinder.vim
+++ b/ale_linters/c/flawfinder.vim
@@ -19,7 +19,7 @@ endfunction
 call ale#linter#Define('c', {
 \  'name': 'flawfinder',
 \  'output_stream': 'stdout',
-\  'executable_callback': ale#VarFunc('c_flawfinder_executable'),
-\  'command_callback': 'ale_linters#c#flawfinder#GetCommand',
+\  'executable': {b -> ale#Var(b, 'c_flawfinder_executable')},
+\  'command': function('ale_linters#c#flawfinder#GetCommand'),
 \  'callback': 'ale#handlers#flawfinder#HandleFlawfinderFormat',
 \})
diff --git a/ale_linters/c/gcc.vim b/ale_linters/c/gcc.vim
index 60ecb712..ccb1912b 100644
--- a/ale_linters/c/gcc.vim
+++ b/ale_linters/c/gcc.vim
@@ -18,7 +18,7 @@ endfunction
 call ale#linter#Define('c', {
 \   'name': 'gcc',
 \   'output_stream': 'stderr',
-\   'executable_callback': ale#VarFunc('c_gcc_executable'),
+\   'executable': {b -> ale#Var(b, 'c_gcc_executable')},
 \   'command_chain': [
 \       {'callback': 'ale#c#GetMakeCommand', 'output_stream': 'stdout'},
 \       {'callback': 'ale_linters#c#gcc#GetCommand'}