From 592bd8c628b105af19b47503257e51e636b64606 Mon Sep 17 00:00:00 2001
From: Adrian Malacoda <malacoda@monarch-pass.net>
Date: Sun, 8 Nov 2020 23:23:31 -0600
Subject: [PATCH] java: make lombok integration optional and don't hardcode my
 user name. Still want to find an optimal way for selecting the best version
 of lombok available, or maybe downloading it if not present.

---
 java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/java b/java
index 3129726..6f13d3f 100644
--- a/java
+++ b/java
@@ -16,14 +16,18 @@ def locate_launcher_configuration (jdt_ls_path):
 
 # TODO
 def locate_lombok ():
-    return "/home/malacoda/.m2/repository/org/projectlombok/lombok/1.18.16/lombok-1.18.16.jar"
+    return os.path.join(os.environ['HOME'], ".m2/repository/org/projectlombok/lombok/1.18.16/lombok-1.18.16.jar")
 
 class Java(LspServer):
     def __init__ (self, arguments):
         self.path = arguments[0]
-        super().__init__([
-            "java",
-            f"-javaagent:{locate_lombok()}",
+        
+        command = ["java"]
+        if "--enable-lombok" in arguments:
+            arguments.remove("--enable-lombok")
+            command.append(f"-javaagent:{locate_lombok()}")
+        
+        command = command + [
             "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=1044",
             "-Declipse.application=org.eclipse.jdt.ls.core.id1",
             "-Dosgi.bundles.defaultStartLevel=4",
@@ -36,7 +40,9 @@ class Java(LspServer):
             "--add-modules=ALL-SYSTEM",
             "--add-opens", "java.base/java.util=ALL-UNNAMED",
             "--add-opens", "java.base/java.lang=ALL-UNNAMED"
-        ] + arguments[1:])
+        ] + arguments[1:]
+        
+        super().__init__(command)
 
     @command("java.apply.workspaceEdit")
     def workspaceEdit (self, arguments):