summaryrefslogtreecommitdiff
path: root/ale_linters/java/javac.vim
diff options
context:
space:
mode:
authorw0rp <devw0rp@gmail.com>2017-05-28 00:52:04 +0100
committerw0rp <devw0rp@gmail.com>2017-05-28 00:52:04 +0100
commitdc775f236c55bd6a1aec59963b45641b0f90b54f (patch)
treec2b116267a59e75f8e26318ad35b8a2438c6ba65 /ale_linters/java/javac.vim
parentc17346d40288de884622435456e01c5de868d6f5 (diff)
downloadale-dc775f236c55bd6a1aec59963b45641b0f90b54f.zip
Revert "Fix #501 - Do not run javac when it is just a stub asking you to install Java on Mac OSX"
This reverts commit 528355e2c6cf64fbc0d459a7a512a7823f90043d.
Diffstat (limited to 'ale_linters/java/javac.vim')
-rw-r--r--ale_linters/java/javac.vim26
1 files changed, 0 insertions, 26 deletions
diff --git a/ale_linters/java/javac.vim b/ale_linters/java/javac.vim
index 038fa249..0b429e05 100644
--- a/ale_linters/java/javac.vim
+++ b/ale_linters/java/javac.vim
@@ -6,27 +6,6 @@ let s:classpath_sep = has('unix') ? ':' : ';'
let g:ale_java_javac_options = get(g:, 'ale_java_javac_options', '')
let g:ale_java_javac_classpath = get(g:, 'ale_java_javac_classpath', '')
-" Detect if the javac command just shows an annoying popup for Mac OSX.
-if has('macunix')
- function s:GetIsJavacAnAppStoreStub() abort
- let l:path = resolve(systemlist('which javac')[0])
-
- for l:line in readfile(l:path)
- " This string is present inside the executable for the popup.
- if l:line =~? 'No Java runtime present'
- return 1
- endif
- endfor
-
- return 0
- endfunction
-
- let s:is_javac_an_app_store_stub = s:GetIsJavacAnAppStoreStub()
- delfunction s:GetIsJavacAnAppStoreStub
-else
- let s:is_javac_an_app_store_stub = 0
-endif
-
function! ale_linters#java#javac#GetImportPaths(buffer) abort
let l:pom_path = ale#path#FindNearestFile(a:buffer, 'pom.xml')
@@ -52,11 +31,6 @@ function! s:BuildClassPathOption(buffer, import_paths) abort
endfunction
function! ale_linters#java#javac#GetCommand(buffer, import_paths) abort
- " If running the command will just show a popup, then don't run it.
- if s:is_javac_an_app_store_stub
- return ''
- endif
-
let l:cp_option = s:BuildClassPathOption(a:buffer, a:import_paths)
let l:sp_option = ''