#2132 - Replace all uses of foo_callback with foo

12 files changed, 26 insertions, 26 deletions

diff --git a/ale_linters/python/bandit.vim b/ale_linters/python/bandit.vim
index 5c9500a6..554f5000 100644
--- a/ale_linters/python/bandit.vim
+++ b/ale_linters/python/bandit.vim
@@ -62,7 +62,7 @@ endfunction
 
 call ale#linter#Define('python', {
 \   'name': 'bandit',
-\   'executable_callback': 'ale_linters#python#bandit#GetExecutable',
-\   'command_callback': 'ale_linters#python#bandit#GetCommand',
+\   'executable': function('ale_linters#python#bandit#GetExecutable'),
+\   'command': function('ale_linters#python#bandit#GetCommand'),
 \   'callback': 'ale_linters#python#bandit#Handle',
 \})
diff --git a/ale_linters/python/flake8.vim b/ale_linters/python/flake8.vim
index 076bd9c4..993d7adb 100644
--- a/ale_linters/python/flake8.vim
+++ b/ale_linters/python/flake8.vim
@@ -143,7 +143,7 @@ endfunction
 
 call ale#linter#Define('python', {
 \   'name': 'flake8',
-\   'executable_callback': 'ale_linters#python#flake8#GetExecutable',
+\   'executable': function('ale_linters#python#flake8#GetExecutable'),
 \   'command_chain': [
 \       {'callback': 'ale_linters#python#flake8#VersionCheck'},
 \       {'callback': 'ale_linters#python#flake8#GetCommand', 'output_stream': 'both'},
diff --git a/ale_linters/python/mypy.vim b/ale_linters/python/mypy.vim
index 0c90a3c7..c4c6507f 100644
--- a/ale_linters/python/mypy.vim
+++ b/ale_linters/python/mypy.vim
@@ -75,7 +75,7 @@ endfunction
 
 call ale#linter#Define('python', {
 \   'name': 'mypy',
-\   'executable_callback': 'ale_linters#python#mypy#GetExecutable',
-\   'command_callback': 'ale_linters#python#mypy#GetCommand',
+\   'executable': function('ale_linters#python#mypy#GetExecutable'),
+\   'command': function('ale_linters#python#mypy#GetCommand'),
 \   'callback': 'ale_linters#python#mypy#Handle',
 \})
diff --git a/ale_linters/python/prospector.vim b/ale_linters/python/prospector.vim
index b01cec87..ee47012f 100644
--- a/ale_linters/python/prospector.vim
+++ b/ale_linters/python/prospector.vim
@@ -93,8 +93,8 @@ endfunction
 
 call ale#linter#Define('python', {
 \   'name': 'prospector',
-\   'executable_callback': 'ale_linters#python#prospector#GetExecutable',
-\   'command_callback': 'ale_linters#python#prospector#GetCommand',
+\   'executable': function('ale_linters#python#prospector#GetExecutable'),
+\   'command': function('ale_linters#python#prospector#GetCommand'),
 \   'callback': 'ale_linters#python#prospector#Handle',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/python/pycodestyle.vim b/ale_linters/python/pycodestyle.vim
index f0269585..fb521bc1 100644
--- a/ale_linters/python/pycodestyle.vim
+++ b/ale_linters/python/pycodestyle.vim
@@ -69,7 +69,7 @@ endfunction
 
 call ale#linter#Define('python', {
 \   'name': 'pycodestyle',
-\   'executable_callback': 'ale_linters#python#pycodestyle#GetExecutable',
-\   'command_callback': 'ale_linters#python#pycodestyle#GetCommand',
+\   'executable': function('ale_linters#python#pycodestyle#GetExecutable'),
+\   'command': function('ale_linters#python#pycodestyle#GetCommand'),
 \   'callback': 'ale_linters#python#pycodestyle#Handle',
 \})
diff --git a/ale_linters/python/pydocstyle.vim b/ale_linters/python/pydocstyle.vim
index 177f5e0f..3901db4d 100644
--- a/ale_linters/python/pydocstyle.vim
+++ b/ale_linters/python/pydocstyle.vim
@@ -67,7 +67,7 @@ endfunction
 
 call ale#linter#Define('python', {
 \   'name': 'pydocstyle',
-\   'executable_callback': 'ale_linters#python#pydocstyle#GetExecutable',
-\   'command_callback': 'ale_linters#python#pydocstyle#GetCommand',
+\   'executable': function('ale_linters#python#pydocstyle#GetExecutable'),
+\   'command': function('ale_linters#python#pydocstyle#GetCommand'),
 \   'callback': 'ale_linters#python#pydocstyle#Handle',
 \})
diff --git a/ale_linters/python/pyflakes.vim b/ale_linters/python/pyflakes.vim
index 091408d5..b5127022 100644
--- a/ale_linters/python/pyflakes.vim
+++ b/ale_linters/python/pyflakes.vim
@@ -43,8 +43,8 @@ endfunction
 
 call ale#linter#Define('python', {
 \   'name': 'pyflakes',
-\   'executable_callback': 'ale_linters#python#pyflakes#GetExecutable',
-\   'command_callback': 'ale_linters#python#pyflakes#GetCommand',
+\   'executable': function('ale_linters#python#pyflakes#GetExecutable'),
+\   'command': function('ale_linters#python#pyflakes#GetCommand'),
 \   'callback': 'ale_linters#python#pyflakes#Handle',
 \   'output_stream': 'both',
 \})
diff --git a/ale_linters/python/pylama.vim b/ale_linters/python/pylama.vim
index 4ad25c0f..38dd2836 100644
--- a/ale_linters/python/pylama.vim
+++ b/ale_linters/python/pylama.vim
@@ -85,8 +85,8 @@ endfunction
 
 call ale#linter#Define('python', {
 \   'name': 'pylama',
-\   'executable_callback': 'ale_linters#python#pylama#GetExecutable',
-\   'command_callback': 'ale_linters#python#pylama#GetCommand',
+\   'executable': function('ale_linters#python#pylama#GetExecutable'),
+\   'command': function('ale_linters#python#pylama#GetCommand'),
 \   'callback': 'ale_linters#python#pylama#Handle',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/python/pylint.vim b/ale_linters/python/pylint.vim
index f0f79cd7..57e82691 100644
--- a/ale_linters/python/pylint.vim
+++ b/ale_linters/python/pylint.vim
@@ -78,8 +78,8 @@ endfunction
 
 call ale#linter#Define('python', {
 \   'name': 'pylint',
-\   'executable_callback': 'ale_linters#python#pylint#GetExecutable',
-\   'command_callback': 'ale_linters#python#pylint#GetCommand',
+\   'executable': function('ale_linters#python#pylint#GetExecutable'),
+\   'command': function('ale_linters#python#pylint#GetCommand'),
 \   'callback': 'ale_linters#python#pylint#Handle',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/python/pyls.vim b/ale_linters/python/pyls.vim
index 2c2ed94c..c7f91430 100644
--- a/ale_linters/python/pyls.vim
+++ b/ale_linters/python/pyls.vim
@@ -28,9 +28,9 @@ endfunction
 call ale#linter#Define('python', {
 \   'name': 'pyls',
 \   'lsp': 'stdio',
-\   'executable_callback': 'ale_linters#python#pyls#GetExecutable',
-\   'command_callback': 'ale_linters#python#pyls#GetCommand',
-\   'project_root_callback': 'ale#python#FindProjectRoot',
+\   'executable': function('ale_linters#python#pyls#GetExecutable'),
+\   'command': function('ale_linters#python#pyls#GetCommand'),
+\   'project_root': function('ale#python#FindProjectRoot'),
 \   'completion_filter': 'ale#completion#python#CompletionItemFilter',
-\   'lsp_config_callback': ale#VarFunc('python_pyls_config'),
+\   'lsp_config': {b -> ale#Var(b, 'python_pyls_config')},
 \})
diff --git a/ale_linters/python/pyre.vim b/ale_linters/python/pyre.vim
index adc185f2..4edd80f7 100644
--- a/ale_linters/python/pyre.vim
+++ b/ale_linters/python/pyre.vim
@@ -27,8 +27,8 @@ endfunction
 call ale#linter#Define('python', {
 \   'name': 'pyre',
 \   'lsp': 'stdio',
-\   'executable_callback': 'ale_linters#python#pyre#GetExecutable',
-\   'command_callback': 'ale_linters#python#pyre#GetCommand',
-\   'project_root_callback': 'ale#python#FindProjectRoot',
+\   'executable': function('ale_linters#python#pyre#GetExecutable'),
+\   'command': function('ale_linters#python#pyre#GetCommand'),
+\   'project_root': function('ale#python#FindProjectRoot'),
 \   'completion_filter': 'ale#completion#python#CompletionItemFilter',
 \})
diff --git a/ale_linters/python/vulture.vim b/ale_linters/python/vulture.vim
index b3908b80..d328d262 100644
--- a/ale_linters/python/vulture.vim
+++ b/ale_linters/python/vulture.vim
@@ -73,8 +73,8 @@ endfunction
 
 call ale#linter#Define('python', {
 \   'name': 'vulture',
-\   'executable_callback': 'ale_linters#python#vulture#GetExecutable',
-\   'command_callback': 'ale_linters#python#vulture#GetCommand',
+\   'executable': function('ale_linters#python#vulture#GetExecutable'),
+\   'command': function('ale_linters#python#vulture#GetCommand'),
 \   'callback': 'ale_linters#python#vulture#Handle',
 \   'lint_file': 1,
 \})