Make lsp-mode parser more robust

Author: yyoncho

lsp-mode.el

@@ -4766,7 +4766,9 @@ WORKSPACE is the active workspace."
           (let* ((body-sep-pos (string-match-p "\r\n\r\n" chunk)))
             (if body-sep-pos
                 ;; We've got all the headers, handle them all at once:
-                (let* ((header-raw (substring chunk 0 body-sep-pos))
+                (let* ((header-raw (substring chunk (or (string-match-p "Content-Length" chunk)
+                                                        (error "Unable to find Content-Length header."))
+                                              body-sep-pos))
                        (content (substring chunk (+ body-sep-pos 4)))
                        (headers
                         (mapcar 'lsp--parse-header

test/lsp-io-test.el

@@ -38,39 +38,45 @@
 
 (ert-deftest lsp--parser-read--multibyte ()
   (let* ((p (make-lsp--parser :workspace lsp--test-workspace))
-				 (message-in "Content-Length: 3\r\n\r\n\xe2\x80\x99")
+         (message-in "Content-Length: 3\r\n\r\n\xe2\x80\x99")
          (messages (lsp--parser-read p message-in)))
     (should (equal messages '("’")))))
 
 (ert-deftest lsp--parser-read--multibyte-nospace ()
   (let* ((p (make-lsp--parser :workspace lsp--test-workspace))
-				 (message-in "Content-Length:3\r\n\r\n\xe2\x80\x99")
+         (message-in "Content-Length:3\r\n\r\n\xe2\x80\x99")
          (messages (lsp--parser-read p message-in)))
     (should (equal messages '("’")))))
 
 (ert-deftest lsp--parser-read--multibyte-received ()
   (let* ((p (make-lsp--parser :workspace lsp--test-workspace))
-				 (message-in "Content-Length: 1152\r\n\r\n{\"jsonrpc\":\"2.0\",\"method\":\"sts/highlight\",\"params\":{\"doc\":{\"version\":0,\"uri\":\"file:///home/kyoncho/Public/Desktop/hellow/hello-world/src/main/java/com/example/helloworld/HelloWorldController.java\"},\"codeLenses\":[{\"range\":{\"start\":{\"line\":9,\"character\":0},\"end\":{\"line\":9,\"character\":11}},\"command\":{\"title\":\"← SampleBean\",\"command\":\"sts.showHoverAtPosition\",\"arguments\":[{\"line\":9,\"character\":0}]},\"data\":\"← SampleBean\"},{\"range\":{\"start\":{\"line\":14,\"character\":4},\"end\":{\"line\":14,\"character\":14}},\"command\":{\"title\":\"← SampleBean\",\"command\":\"sts.showHoverAtPosition\",\"arguments\":[{\"line\":14,\"character\":4}]},\"data\":\"← SampleBean\"},{\"range\":{\"start\":{\"line\":17,\"character\":4},\"end\":{\"line\":17,\"character\":31}},\"command\":{\"title\":\"http://127.0.0.1:8080/hello-world\",\"command\":\"sts.open.url\",\"arguments\":[\"http://127.0.0.1:8080/hello-world\"]},\"data\":\"http://127.0.0.1:8080/hello-world\"},{\"range\":{\"start\":{\"line\":25,\"character\":4},\"end\":{\"line\":25,\"character\":32}},\"command\":{\"title\":\"http://127.0.0.1:8080/hello-world2\",\"command\":\"sts.open.url\",\"arguments\":[\"http://127.0.0.1:8080/hello-world2\"]},\"data\":\"http://127.0.0.1:8080/hello-world2\"}]}}")
+         (message-in "Content-Length: 1152\r\n\r\n{\"jsonrpc\":\"2.0\",\"method\":\"sts/highlight\",\"params\":{\"doc\":{\"version\":0,\"uri\":\"file:///home/kyoncho/Public/Desktop/hellow/hello-world/src/main/java/com/example/helloworld/HelloWorldController.java\"},\"codeLenses\":[{\"range\":{\"start\":{\"line\":9,\"character\":0},\"end\":{\"line\":9,\"character\":11}},\"command\":{\"title\":\"← SampleBean\",\"command\":\"sts.showHoverAtPosition\",\"arguments\":[{\"line\":9,\"character\":0}]},\"data\":\"← SampleBean\"},{\"range\":{\"start\":{\"line\":14,\"character\":4},\"end\":{\"line\":14,\"character\":14}},\"command\":{\"title\":\"← SampleBean\",\"command\":\"sts.showHoverAtPosition\",\"arguments\":[{\"line\":14,\"character\":4}]},\"data\":\"← SampleBean\"},{\"range\":{\"start\":{\"line\":17,\"character\":4},\"end\":{\"line\":17,\"character\":31}},\"command\":{\"title\":\"http://127.0.0.1:8080/hello-world\",\"command\":\"sts.open.url\",\"arguments\":[\"http://127.0.0.1:8080/hello-world\"]},\"data\":\"http://127.0.0.1:8080/hello-world\"},{\"range\":{\"start\":{\"line\":25,\"character\":4},\"end\":{\"line\":25,\"character\":32}},\"command\":{\"title\":\"http://127.0.0.1:8080/hello-world2\",\"command\":\"sts.open.url\",\"arguments\":[\"http://127.0.0.1:8080/hello-world2\"]},\"data\":\"http://127.0.0.1:8080/hello-world2\"}]}}")
          (messages (lsp--parser-read p message-in)))
     (should (equal messages '("{\"jsonrpc\":\"2.0\",\"method\":\"sts/highlight\",\"params\":{\"doc\":{\"version\":0,\"uri\":\"file:///home/kyoncho/Public/Desktop/hellow/hello-world/src/main/java/com/example/helloworld/HelloWorldController.java\"},\"codeLenses\":[{\"range\":{\"start\":{\"line\":9,\"character\":0},\"end\":{\"line\":9,\"character\":11}},\"command\":{\"title\":\"← SampleBean\",\"command\":\"sts.showHoverAtPosition\",\"arguments\":[{\"line\":9,\"character\":0}]},\"data\":\"← SampleBean\"},{\"range\":{\"start\":{\"line\":14,\"character\":4},\"end\":{\"line\":14,\"character\":14}},\"command\":{\"title\":\"← SampleBean\",\"command\":\"sts.showHoverAtPosition\",\"arguments\":[{\"line\":14,\"character\":4}]},\"data\":\"← SampleBean\"},{\"range\":{\"start\":{\"line\":17,\"character\":4},\"end\":{\"line\":17,\"character\":31}},\"command\":{\"title\":\"http://127.0.0.1:8080/hello-world\",\"command\":\"sts.open.url\",\"arguments\":[\"http://127.0.0.1:8080/hello-world\"]},\"data\":\"http://127.0.0.1:8080/hello-world\"},{\"range\":{\"start\":{\"line\":25,\"character\":4},\"end\":{\"line\":25,\"character\":32}},\"command\":{\"title\":\"http://127.0.0.1:8080/hello-world2\",\"command\":\"sts.open.url\",\"arguments\":[\"http://127.0.0.1:8080/hello-world2\"]},\"data\":\"http://127.0.0.1:8080/hello-world2\"}]}}")))))
 
 (ert-deftest lsp--parser-read--multiple-chunks ()
   (let* ((p (make-lsp--parser :workspace lsp--test-workspace)))
-		(should (equal (lsp--parser-read p "Content-Length: 14\r\n\r\n{") nil))
-		(should (equal (lsp--parser-read p "\"somedata\":1") nil))
-		(should (equal (lsp--parser-read p "}Content-Length: 14\r\n\r\n{")
-									 '("{\"somedata\":1}")))
-		(should (equal (lsp--parser-read p "\"somedata\":2}")
-									 '("{\"somedata\":2}")))))
+    (should (equal (lsp--parser-read p "Content-Length: 14\r\n\r\n{") nil))
+    (should (equal (lsp--parser-read p "\"somedata\":1") nil))
+    (should (equal (lsp--parser-read p "}Content-Length: 14\r\n\r\n{")
+                   '("{\"somedata\":1}")))
+    (should (equal (lsp--parser-read p "\"somedata\":2}")
+                   '("{\"somedata\":2}")))))
 
 (ert-deftest lsp--parser-read--multiple-multibyte-chunks ()
   (let* ((p (make-lsp--parser :workspace lsp--test-workspace)))
-		(should (equal (lsp--parser-read p "Content-Length: 18\r") nil))
-		(should (equal (lsp--parser-read p "\n\r\n{\"somedata\":\"\xe2\x80") nil))
-		(should (equal (lsp--parser-read p "\x99\"}Content-Length: 14\r\n\r\n{")
-									 '("{\"somedata\":\"’\"}")))
-		(should (equal (lsp--parser-read p "\"somedata\":2}")
-									 '("{\"somedata\":2}")))))
+    (should (equal (lsp--parser-read p "Content-Length: 18\r") nil))
+    (should (equal (lsp--parser-read p "\n\r\n{\"somedata\":\"\xe2\x80") nil))
+    (should (equal (lsp--parser-read p "\x99\"}Content-Length: 14\r\n\r\n{")
+                   '("{\"somedata\":\"’\"}")))
+    (should (equal (lsp--parser-read p "\"somedata\":2}")
+                   '("{\"somedata\":2}")))))
+
+(ert-deftest lsp--non-related-content-on-stdout ()
+  (let* ((p (make-lsp--parser :workspace lsp--test-workspace)))
+    (let* ((p (make-lsp--parser :workspace lsp--test-workspace)))
+      (should (equal (lsp--parser-read p "ConentOnStdoutContent-Length: 14\r\n\r\n{\"somedata\":1}")
+                     '("{\"somedata\":1}"))))))
 
 (ert-deftest lsp--parser-read--ignored-messages ()
   (lsp--on-notification