1 files changed, 20 insertions(+), 23 deletions(-)

M vim/bin/java-language-server

@@ 4,8 4,8 @@ set -o errexit
 set -o nounset
 
 jdtls_version="1.9.0"
-java_debug_version="0.30.1"
-java_test_version="0.29.0"
+java_debug_version="0.46.0"
+java_test_version="0.37.1"
 
 install_only=false
 debug=false


@@ 52,27 52,24 @@ language_server_test="${language_server_home}/extensions/java-test"
     popd 2>/dev/null
   fi
 
-  # TODO: install java-debug and java-test
-
-  #if [[ ! -d "${language_server_debug}" ]]; then
-  #  echo 'Installing java-debug extension on first use... (will take a moment)'
-  #  mkdir -p "$(dirname "${language_server_debug}")"
-  #  git clone --depth=1 --single-branch --branch "${java_debug_version}" \
-  #    https://github.com/microsoft/java-debug.git "${language_server_debug}"
-  #  pushd "${language_server_debug}"
-  #    ./mvnw clean package \
-  #      && ln -s "${language_server_debug}/com.microsoft.java.debug.plugin/target/com.microsoft.java.debug.plugin-${java_debug_version}.jar" ../debug.jar
-  #  popd
-  #fi
-
-  #if [[ ! -d "${language_server_test}" ]]; then
-  #  echo 'Installing java-test extension on first use... (will take a moment)'
-  #  mkdir -p "${language_server_test}"
-  #  pushd "${language_server_test}"
-  #    wget -O extension.zip "https://vscjava.gallery.vsassets.io/_apis/public/gallery/publisher/vscjava/extension/vscode-java-test/${java_test_version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage"
-  #    unzip extension.zip
-  #  popd
-  #fi
+  if [[ ! -d "${language_server_debug}" ]]; then
+    echo 'Downloading java-debug extension...'
+    mkdir -p "${language_server_debug}"
+    pushd "${language_server_debug}" 2>/dev/null
+      wget -O extension.zip "https://vscjava.gallery.vsassets.io/_apis/public/gallery/publisher/vscjava/extension/vscode-java-debug/${java_debug_version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage"
+      unzip extension.zip
+      ln -s "${language_server_debug}/extension/server/"com.microsoft.java.debug.plugin-*.jar ../debug.jar
+    popd 2>/dev/null
+  fi
+
+  if [[ ! -d "${language_server_test}" ]]; then
+    echo 'Downloading java-test extension...'
+    mkdir -p "${language_server_test}"
+    pushd "${language_server_test}" 2>/dev/null
+      wget -O extension.zip "https://vscjava.gallery.vsassets.io/_apis/public/gallery/publisher/vscjava/extension/vscode-java-test/${java_test_version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage"
+      unzip extension.zip
+    popd 2>/dev/null
+  fi
 
   if [[ "${install_only}" = true ]]; then
     exit 0