Skip to content

Commit 14a2c19

Browse files
committed
Remove jdt.ls version from launching script
1 parent 66bf0f9 commit 14a2c19

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ Edit your .vimrc file and configure like :
3030
let g:vim_lsp_java = {
3131
\ 'eclipse_jdtls' : {
3232
\ 'repository': expand('~/opt/eclipse.jdt.ls/org.eclipse.jdt.ls.product/target/repository'),
33-
\ 'version': '1.5.700.v20200107-1357',
3433
\ 'config': 'config_linux',
3534
\ 'workspace': expand('$WORKSPACE'),
3635
\ },

jdtls

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#!/bin/sh
22

33
JDTLS_REPOSITORY=$1
4-
JDTLS_VERSION=$2
5-
JDTLS_CONFIG=$3
6-
JDTLS_WORKSPACE=$4
4+
JDTLS_LAUNCHER=$(ls $JDTLS_REPOSITORY/plugins/org.eclipse.equinox.launcher_*.jar)
5+
JDTLS_CONFIG=$2
6+
JDTLS_WORKSPACE=$3
77

88
java -Declipse.application=org.eclipse.jdt.ls.core.id1 \
99
-Dosgi.bundles.defaultStartLevel=4 \
1010
-Declipse.product=org.eclipse.jdt.ls.core.product \
1111
-Dlog.level=ALL \
1212
-noverify \
13-
-jar $JDTLS_REPOSITORY/plugins/org.eclipse.equinox.launcher_$JDTLS_VERSION.jar \
13+
-jar $JDTLS_LAUNCHER \
1414
-configuration $JDTLS_REPOSITORY/$JDTLS_CONFIG \
1515
-data $JDTLS_WORKSPACE \
1616
--add-modules=ALL-SYSTEM --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED \

jdtls-jdk8

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#!/bin/sh
22

33
JDTLS_REPOSITORY=$1
4-
JDTLS_VERSION=$2
5-
JDTLS_CONFIG=$3
6-
JDTLS_WORKSPACE=$4
4+
JDTLS_LAUNCHER=$(ls $JDTLS_REPOSITORY/plugins/org.eclipse.equinox.launcher_*.jar)
5+
JDTLS_CONFIG=$2
6+
JDTLS_WORKSPACE=$3
77

88
java -Declipse.application=org.eclipse.jdt.ls.core.id1 \
99
-Dosgi.bundles.defaultStartLevel=4 \
1010
-Declipse.product=org.eclipse.jdt.ls.core.product \
1111
-Dlog.level=ALL \
1212
-noverify \
13-
-jar $JDTLS_REPOSITORY/plugins/org.eclipse.equinox.launcher_$JDTLS_VERSION.jar \
13+
-jar $JDTLS_LAUNCHER \
1414
-configuration $JDTLS_REPOSITORY/$JDTLS_CONFIG \
1515
-data $JDTLS_WORKSPACE \
1616
# http://www.nicolasbize.com/blog/7-tips-to-speed-up-eclipse/

plugin/lsp-java.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if isdirectory(g:vim_lsp_java.eclipse_jdtls.repository)
22
au User lsp_setup call lsp#register_server({
33
\ 'name': 'vim-lsp-java.eclipse-jdtls',
4-
\ 'cmd': {server_info->[&shell, &shellcmdflag, expand('~/.vim/bundle/vim-lsp-java/jdtls').' '.g:vim_lsp_java.eclipse_jdtls.repository.' '.g:vim_lsp_java.eclipse_jdtls.version.' '.g:vim_lsp_java.eclipse_jdtls.config.' '.g:vim_lsp_java.eclipse_jdtls.workspace]},
4+
\ 'cmd': {server_info->[&shell, &shellcmdflag, expand('~/.vim/bundle/vim-lsp-java/jdtls').' '.g:vim_lsp_java.eclipse_jdtls.repository.' '.g:vim_lsp_java.eclipse_jdtls.config.' '.g:vim_lsp_java.eclipse_jdtls.workspace]},
55
\ 'root_uri':{server_info->lsp#utils#path_to_uri(lsp#utils#find_nearest_parent_file_directory(lsp#utils#get_buffer_path(), 'pom.xml'))},
66
\ 'whitelist': ['java'],
77
\ })

0 commit comments

Comments
 (0)