#2132 - Replace all uses of foo_callback with foo

10 files changed, 19 insertions, 19 deletions

diff --git a/ale_linters/go/bingo.vim b/ale_linters/go/bingo.vim
index ba80fbe8..e446bdcc 100644
--- a/ale_linters/go/bingo.vim
+++ b/ale_linters/go/bingo.vim
@@ -23,7 +23,7 @@ endfunction
 call ale#linter#Define('go', {
 \   'name': 'bingo',
 \   'lsp': 'stdio',
-\   'executable_callback': ale#VarFunc('go_bingo_executable'),
-\   'command_callback': 'ale_linters#go#bingo#GetCommand',
-\   'project_root_callback': 'ale_linters#go#bingo#FindProjectRoot',
+\   'executable': {b -> ale#Var(b, 'go_bingo_executable')},
+\   'command': function('ale_linters#go#bingo#GetCommand'),
+\   'project_root': function('ale_linters#go#bingo#FindProjectRoot'),
 \})
diff --git a/ale_linters/go/gobuild.vim b/ale_linters/go/gobuild.vim
index cef1ff88..374ded35 100644
--- a/ale_linters/go/gobuild.vim
+++ b/ale_linters/go/gobuild.vim
@@ -48,8 +48,8 @@ endfunction
 call ale#linter#Define('go', {
 \   'name': 'gobuild',
 \   'aliases': ['go build'],
-\   'executable_callback': ale#VarFunc('go_go_executable'),
-\   'command_callback': 'ale_linters#go#gobuild#GetCommand',
+\   'executable': {b -> ale#Var(b, 'go_go_executable')},
+\   'command': function('ale_linters#go#gobuild#GetCommand'),
 \   'output_stream': 'stderr',
 \   'callback': 'ale_linters#go#gobuild#Handler',
 \   'lint_file': 1,
diff --git a/ale_linters/go/golangci_lint.vim b/ale_linters/go/golangci_lint.vim
index dd9a3c64..357f7949 100644
--- a/ale_linters/go/golangci_lint.vim
+++ b/ale_linters/go/golangci_lint.vim
@@ -49,8 +49,8 @@ endfunction
 
 call ale#linter#Define('go', {
 \   'name': 'golangci-lint',
-\   'executable_callback': ale#VarFunc('go_golangci_lint_executable'),
-\   'command_callback': 'ale_linters#go#golangci_lint#GetCommand',
+\   'executable': {b -> ale#Var(b, 'go_golangci_lint_executable')},
+\   'command': function('ale_linters#go#golangci_lint#GetCommand'),
 \   'callback': 'ale_linters#go#golangci_lint#Handler',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/go/golint.vim b/ale_linters/go/golint.vim
index 4bf14fcc..765e1477 100644
--- a/ale_linters/go/golint.vim
+++ b/ale_linters/go/golint.vim
@@ -15,7 +15,7 @@ endfunction
 call ale#linter#Define('go', {
 \   'name': 'golint',
 \   'output_stream': 'both',
-\   'executable_callback': ale#VarFunc('go_golint_executable'),
-\   'command_callback': 'ale_linters#go#golint#GetCommand',
+\   'executable': {b -> ale#Var(b, 'go_golint_executable')},
+\   'command': function('ale_linters#go#golint#GetCommand'),
 \   'callback': 'ale#handlers#unix#HandleAsWarning',
 \})
diff --git a/ale_linters/go/gometalinter.vim b/ale_linters/go/gometalinter.vim
index d005e1d2..19d70a81 100644
--- a/ale_linters/go/gometalinter.vim
+++ b/ale_linters/go/gometalinter.vim
@@ -50,8 +50,8 @@ endfunction
 
 call ale#linter#Define('go', {
 \   'name': 'gometalinter',
-\   'executable_callback': ale#VarFunc('go_gometalinter_executable'),
-\   'command_callback': 'ale_linters#go#gometalinter#GetCommand',
+\   'executable': {b -> ale#Var(b, 'go_gometalinter_executable')},
+\   'command': function('ale_linters#go#gometalinter#GetCommand'),
 \   'callback': 'ale_linters#go#gometalinter#Handler',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/go/gosimple.vim b/ale_linters/go/gosimple.vim
index dbdc3fcf..281a0e53 100644
--- a/ale_linters/go/gosimple.vim
+++ b/ale_linters/go/gosimple.vim
@@ -8,7 +8,7 @@ endfunction
 call ale#linter#Define('go', {
 \   'name': 'gosimple',
 \   'executable': 'gosimple',
-\   'command_callback': 'ale_linters#go#gosimple#GetCommand',
+\   'command': function('ale_linters#go#gosimple#GetCommand'),
 \   'callback': 'ale#handlers#go#Handler',
 \   'output_stream': 'both',
 \   'lint_file': 1,
diff --git a/ale_linters/go/gotype.vim b/ale_linters/go/gotype.vim
index a678e0f3..159df892 100644
--- a/ale_linters/go/gotype.vim
+++ b/ale_linters/go/gotype.vim
@@ -13,7 +13,7 @@ call ale#linter#Define('go', {
 \   'name': 'gotype',
 \   'output_stream': 'stderr',
 \   'executable': 'gotype',
-\   'command_callback': 'ale_linters#go#gotype#GetCommand',
+\   'command': function('ale_linters#go#gotype#GetCommand'),
 \   'callback': 'ale#handlers#go#Handler',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/go/govet.vim b/ale_linters/go/govet.vim
index 3d0d2adf..bb81d5d0 100644
--- a/ale_linters/go/govet.vim
+++ b/ale_linters/go/govet.vim
@@ -20,8 +20,8 @@ call ale#linter#Define('go', {
 \   'name': 'govet',
 \   'aliases': ['go vet'],
 \   'output_stream': 'stderr',
-\   'executable_callback': ale#VarFunc('go_go_executable'),
-\   'command_callback': 'ale_linters#go#govet#GetCommand',
+\   'executable': {b -> ale#Var(b, 'go_go_executable')},
+\   'command': function('ale_linters#go#govet#GetCommand'),
 \   'callback': 'ale#handlers#go#Handler',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/go/langserver.vim b/ale_linters/go/langserver.vim
index e049be7b..776186c7 100644
--- a/ale_linters/go/langserver.vim
+++ b/ale_linters/go/langserver.vim
@@ -22,7 +22,7 @@ endfunction
 call ale#linter#Define('go', {
 \   'name': 'golangserver',
 \   'lsp': 'stdio',
-\   'executable_callback': ale#VarFunc('go_langserver_executable'),
-\   'command_callback': 'ale_linters#go#langserver#GetCommand',
-\   'project_root_callback': 'ale#go#FindProjectRoot',
+\   'executable': {b -> ale#Var(b, 'go_langserver_executable')},
+\   'command': function('ale_linters#go#langserver#GetCommand'),
+\   'project_root': function('ale#go#FindProjectRoot'),
 \})
diff --git a/ale_linters/go/staticcheck.vim b/ale_linters/go/staticcheck.vim
index a3464015..26fe0193 100644
--- a/ale_linters/go/staticcheck.vim
+++ b/ale_linters/go/staticcheck.vim
@@ -26,7 +26,7 @@ endfunction
 call ale#linter#Define('go', {
 \   'name': 'staticcheck',
 \   'executable': 'staticcheck',
-\   'command_callback': 'ale_linters#go#staticcheck#GetCommand',
+\   'command': function('ale_linters#go#staticcheck#GetCommand'),
 \   'callback': 'ale#handlers#go#Handler',
 \   'output_stream': 'both',
 \   'lint_file': 1,