update java LSP to 1.1.1

lsp_proxy/java.py

@@ -8,7 +8,7 @@ from .lsp import LspServer, command, get_data_home
 
 FILE_URI = "file://"
 
-VERSION = "0.64.0"
+VERSION = "1.1.1"
 DOWNLOADS_URI = "http://download.eclipse.org/jdtls/milestones/{version}/{file}"
 LATEST = "latest.txt"
 

lsp_proxy/lsp.py

@@ -10,34 +10,40 @@ from xdg import xdg_data_home
 
 CONTENT_LENGTH = "Content-Length: "
 
-def process_messages (source, sink, handlers, log):
-    print("start message handler", file=log)
+def log (message, *args, **kwargs):
+    print(message.format(*args, **kwargs), file=sys.stderr)
+
+def process_messages (label, source, sink, handlers):
+    log(f"[{label}] start process_messages")
     while True:
         line = source.readline()
         if not line:
             break
         
-        line = line.decode()
-        if line.startswith(CONTENT_LENGTH):
-            content_length = int(line[len(CONTENT_LENGTH):].strip())
-            print(f">> ce: [{content_length}]", file=log)
-            
-            source.readline()
-            
-            payload = source.read(content_length).decode()
-            print(f">> payload: [{payload}]", file=log)
-            
-            if handlers:
-                payload_parsed = json.loads(payload)
-                for handler in handlers:
-                    try:
-                        handler(payload_parsed)
-                    except Exception as e:
-                        print(f"Error from handler: {e}", file=log)
-            
-            transmit_payload(payload, sink)
+        try:
+            line = line.decode()
+            if line.startswith(CONTENT_LENGTH):
+                content_length = int(line[len(CONTENT_LENGTH):].strip())
+                log(f">> [{label}] ce: [{content_length}]")
+                
+                source.readline()
+                
+                payload = source.read(content_length).decode()
+                log(">> [{label}] payload: [{payload}]", label=label, payload=payload)
+
+                if handlers:
+                    payload_parsed = json.loads(payload)
+                    for handler in handlers:
+                        try:
+                            handler(payload_parsed)
+                        except Exception as e:
+                            log(f"Error from handler: {e}")
+                
+                transmit_payload(payload, sink)
+        except Exception as e:
+            log(f"[{label}] Error decoding input: {e}")
     
-    print("stop message handler", file=log)
+    log(f"[{label}] exit process_messages")
 
 def transmit_payload (payload, sink):
     if isinstance(payload, dict):
@@ -91,13 +97,16 @@ class LspServer:
     def start (self):
         handlers = self.handlers + handler.get_handlers(self)
         
+        log("starting lsp process: {}", " ".join(self.command))
         with Popen(self.command, stdin=PIPE, stdout=PIPE) as process:
             self.process = process
             
-            self.process_reader = Thread(target=process_messages, args=[process.stdout, sys.stdout.buffer, handlers,  sys.stderr])
+            self.process_reader = Thread(target=process_messages, args=["process.stdout reader", process.stdout, sys.stdout.buffer, handlers])
             self.process_reader.start()
             
-            process_messages(sys.stdin.buffer, process.stdin, handlers, sys.stderr)
+            process_messages("process.stdin reader", sys.stdin.buffer, process.stdin, handlers)
+
+        log("lsp process ended")
             
     def start2 (self):
         run(self.command)