Merge pull request #767 from borodean/ts-server-cr-lf-fix

Bypass the TSServer CRLF bug

typescript/libs/global_vars.py

@@ -4,6 +4,8 @@
 import sublime
 from os.path import dirname
 
+IS_WINDOWS = sublime.platform() == "windows"
+
 # determine if the host is sublime text 2
 IS_ST2 = int(sublime.version()) < 3000
 

typescript/libs/node_client.py

@@ -185,6 +185,15 @@ def read_msg(stream, msgq, asyncReq, proc, asyncEventHandlers):
         if body_length > 0:
             data = stream.read(body_length)
             log.debug('Read body of length: {0}'.format(body_length))
+
+            # TypeScript adds a newline at the end of the response message and counts
+            # it as one character (LF) towards the content length. However, newlines
+            # are two characters on Windows (CR LF), so we need to take care of that.
+            # See issue: https://github.com/Microsoft/TypeScript/issues/3403
+            # The fix is based on: https://github.com/ycm-core/ycmd/pull/503
+            if global_vars.IS_WINDOWS and data.endswith(b'\r'):
+                data += stream.read(1)
+
             data_json = data.decode("utf-8")
 
             data_dict = json_helpers.decode(data_json)