diff --git a/ftplugin/java.lua b/ftplugin/java.lua index 0aedbf06..bba968b9 100644 --- a/ftplugin/java.lua +++ b/ftplugin/java.lua @@ -5,16 +5,13 @@ end if O.lang.java.java_tools.active then -- find_root looks for parent directories relative to the current buffer containing one of the given arguments. if vim.fn.has "mac" == 1 then - JAVA_LS_EXECUTABLE = CONFIG_PATH .. "/utils/bin/java-mac-ls" WORKSPACE_PATH = "/Users/" .. USER .. "/workspace/" elseif vim.fn.has "unix" == 1 then - JAVA_LS_EXECUTABLE = CONFIG_PATH .. "/utils/bin/java-linux-ls" WORKSPACE_PATH = "/home/" .. USER .. "/workspace/" else print "Unsupported system" end - print(JAVA_LS_EXECUTABLE) - print(WORKSPACE_PATH) + JAVA_LS_EXECUTABLE = CONFIG_PATH .. "/utils/bin/jdtls" require("jdtls").start_or_attach { on_attach = require("lsp").common_on_attach, diff --git a/utils/bin/java-linux-ls b/utils/bin/java-linux-ls deleted file mode 100755 index c5ea391a..00000000 --- a/utils/bin/java-linux-ls +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# NOTE: -# This doesn't work as is on Windows. You'll need to create an equivalent `.bat` file instead -# -# NOTE: -# If you're not using Linux you'll need to adjust the `-configuration` option -# to point to the `config_mac' or `config_win` folders depending on your system. - -JAR="$HOME/.config/nvim/.language-servers/eclipse.jdt.ls/org.eclipse.jdt.ls.product/target/repository/plugins/org.eclipse.equinox.launcher_*.jar" -GRADLE_HOME=$HOME/gradle $HOME/.sdkman/candidates/java/current/bin/java \ - -Declipse.application=org.eclipse.jdt.ls.core.id1 \ - -Dosgi.bundles.defaultStartLevel=4 \ - -Declipse.product=org.eclipse.jdt.ls.core.product \ - -Dlog.protocol=true \ - -Dlog.level=ALL \ - -javaagent:/usr/local/share/lombok/lombok.jar \ - -Xms1g \ - -Xmx2G \ - -jar $(echo "$JAR") \ - -configuration "$HOME/.config/nvim/.language-servers/eclipse.jdt.ls/org.eclipse.jdt.ls.product/target/repository/config_linux" \ - -data "${1:-$HOME/workspace}" \ - --add-modules=ALL-SYSTEM \ - --add-opens java.base/java.util=ALL-UNNAMED \ - --add-opens java.base/java.lang=ALL-UNNAMED - - # for older java versions if you wanna use lombok - # -Xbootclasspath/a:/usr/local/share/lombok/lombok.jar \ diff --git a/utils/bin/java-mac-ls b/utils/bin/jdtls similarity index 100% rename from utils/bin/java-mac-ls rename to utils/bin/jdtls diff --git a/utils/bin/nv b/utils/bin/nv deleted file mode 100755 index 87e5e72a..00000000 --- a/utils/bin/nv +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -nvim -u ~/.config/nvim/init.lua