Close #1521 - Allow the language to be set with simple strings for LSP linters

6 files changed, 6 insertions, 31 deletions

diff --git a/ale_linters/dart/language_server.vim b/ale_linters/dart/language_server.vim
index 15c77017..bed77c52 100644
--- a/ale_linters/dart/language_server.vim
+++ b/ale_linters/dart/language_server.vim
@@ -7,10 +7,6 @@ function! ale_linters#dart#language_server#GetExecutable(buffer) abort
     return ale#Var(a:buffer, 'dart_language_server_executable')
 endfunction
 
-function! ale_linters#dart#language_server#GetLanguage(buffer) abort
-    return 'dart'
-endfunction
-
 function! ale_linters#dart#language_server#GetProjectRoot(buffer) abort
     " Note: pub only looks for pubspec.yaml, there's no point in adding
     " support for pubspec.yml
@@ -24,7 +20,6 @@ call ale#linter#Define('dart', {
 \   'lsp': 'stdio',
 \   'executable_callback': 'ale_linters#dart#language_server#GetExecutable',
 \   'command_callback': 'ale_linters#dart#language_server#GetExecutable',
-\   'language_callback': 'ale_linters#dart#language_server#GetLanguage',
+\   'language': 'dart',
 \   'project_root_callback': 'ale_linters#dart#language_server#GetProjectRoot',
 \})
-
diff --git a/ale_linters/glsl/glslls.vim b/ale_linters/glsl/glslls.vim
index 67ea379c..c19f28c2 100644
--- a/ale_linters/glsl/glslls.vim
+++ b/ale_linters/glsl/glslls.vim
@@ -18,10 +18,6 @@ function! ale_linters#glsl#glslls#GetCommand(buffer) abort
     return ale#Escape(l:executable) . l:logfile_args . ' --stdin'
 endfunction
 
-function! ale_linters#glsl#glslls#GetLanguage(buffer) abort
-    return 'glsl'
-endfunction
-
 function! ale_linters#glsl#glslls#GetProjectRoot(buffer) abort
     let l:project_root = ale#c#FindProjectRoot(a:buffer)
 
@@ -33,6 +29,6 @@ call ale#linter#Define('glsl', {
 \   'lsp': 'stdio',
 \   'executable_callback': 'ale_linters#glsl#glslls#GetExecutable',
 \   'command_callback': 'ale_linters#glsl#glslls#GetCommand',
-\   'language_callback': 'ale_linters#glsl#glslls#GetLanguage',
+\   'language': 'glsl',
 \   'project_root_callback': 'ale_linters#glsl#glslls#GetProjectRoot',
 \})
diff --git a/ale_linters/php/langserver.vim b/ale_linters/php/langserver.vim
index 7e1321f9..0f3ead66 100644
--- a/ale_linters/php/langserver.vim
+++ b/ale_linters/php/langserver.vim
@@ -14,10 +14,6 @@ function! ale_linters#php#langserver#GetCommand(buffer) abort
     return 'php ' . ale#Escape(ale_linters#php#langserver#GetExecutable(a:buffer))
 endfunction
 
-function! ale_linters#php#langserver#GetLanguage(buffer) abort
-    return 'php'
-endfunction
-
 function! ale_linters#php#langserver#GetProjectRoot(buffer) abort
     let l:git_path = ale#path#FindNearestDirectory(a:buffer, '.git')
 
@@ -29,6 +25,6 @@ call ale#linter#Define('php', {
 \   'lsp': 'stdio',
 \   'executable_callback': 'ale_linters#php#langserver#GetExecutable',
 \   'command_callback': 'ale_linters#php#langserver#GetCommand',
-\   'language_callback': 'ale_linters#php#langserver#GetLanguage',
+\   'language': 'php',
 \   'project_root_callback': 'ale_linters#php#langserver#GetProjectRoot',
 \})
diff --git a/ale_linters/python/pyls.vim b/ale_linters/python/pyls.vim
index 09f31ec6..883b38f5 100644
--- a/ale_linters/python/pyls.vim
+++ b/ale_linters/python/pyls.vim
@@ -14,16 +14,12 @@ function! ale_linters#python#pyls#GetCommand(buffer) abort
     return ale#Escape(l:executable)
 endfunction
 
-function! ale_linters#python#pyls#GetLanguage(buffer) abort
-    return 'python'
-endfunction
-
 call ale#linter#Define('python', {
 \   'name': 'pyls',
 \   'lsp': 'stdio',
 \   'executable_callback': 'ale_linters#python#pyls#GetExecutable',
 \   'command_callback': 'ale_linters#python#pyls#GetCommand',
-\   'language_callback': 'ale_linters#python#pyls#GetLanguage',
+\   'language': 'python',
 \   'project_root_callback': 'ale#python#FindProjectRoot',
 \   'completion_filter': 'ale#completion#python#CompletionItemFilter',
 \})
diff --git a/ale_linters/rust/rls.vim b/ale_linters/rust/rls.vim
index 24316b04..d5160b14 100644
--- a/ale_linters/rust/rls.vim
+++ b/ale_linters/rust/rls.vim
@@ -19,10 +19,6 @@ function! ale_linters#rust#rls#GetCommand(buffer) abort
     endif
 endfunction
 
-function! ale_linters#rust#rls#GetLanguage(buffer) abort
-    return 'rust'
-endfunction
-
 function! ale_linters#rust#rls#GetProjectRoot(buffer) abort
     let l:cargo_file = ale#path#FindNearestFile(a:buffer, 'Cargo.toml')
 
@@ -34,6 +30,6 @@ call ale#linter#Define('rust', {
 \   'lsp': 'stdio',
 \   'executable_callback': 'ale_linters#rust#rls#GetExecutable',
 \   'command_callback': 'ale_linters#rust#rls#GetCommand',
-\   'language_callback': 'ale_linters#rust#rls#GetLanguage',
+\   'language': 'rust',
 \   'project_root_callback': 'ale_linters#rust#rls#GetProjectRoot',
 \})
diff --git a/ale_linters/typescript/tsserver.vim b/ale_linters/typescript/tsserver.vim
index 5eb77dad..08bd0f41 100644
--- a/ale_linters/typescript/tsserver.vim
+++ b/ale_linters/typescript/tsserver.vim
@@ -10,10 +10,6 @@ function! ale_linters#typescript#tsserver#GetProjectRoot(buffer) abort
     return ''
 endfunction
 
-function! ale_linters#typescript#tsserver#GetLanguage(buffer) abort
-    return ''
-endfunction
-
 function! ale_linters#typescript#tsserver#GetExecutable(buffer) abort
     return ale#node#FindExecutable(a:buffer, 'typescript_tsserver', [
     \   'node_modules/.bin/tsserver',
@@ -26,5 +22,5 @@ call ale#linter#Define('typescript', {
 \   'executable_callback': 'ale_linters#typescript#tsserver#GetExecutable',
 \   'command_callback': 'ale_linters#typescript#tsserver#GetExecutable',
 \   'project_root_callback': 'ale_linters#typescript#tsserver#GetProjectRoot',
-\   'language_callback': 'ale_linters#typescript#tsserver#GetLanguage',
+\   'language': '',
 \})