Fix the TCP server (palantir#42)

gatesn · web-flow · commit 4ca237e9ca3f · 2017-04-25T23:25:10.000+01:00
diff --git a/pyls/language_server.py b/pyls/language_server.py
@@ -7,10 +7,29 @@
 log = logging.getLogger(__name__)
 
 
+class _StreamHandlerWrapper(socketserver.StreamRequestHandler, object):
+    """A wrapper class that is used to construct a custom handler class."""
+
+    def setup(self):
+        super(_StreamHandlerWrapper, self).setup()
+        self.delegate = self.DELEGATE_CLASS(self.rfile, self.wfile)
+
+    def handle(self):
+        self.delegate.handle()
+
+
 def start_tcp_lang_server(bind_addr, port, handler_class):
     if not issubclass(handler_class, LanguageServer):
         raise ValueError("Handler class must be a subclass of LanguageServer")
-    server = socketserver.ThreadingTCPServer((bind_addr, port), handler_class)
+
+    # Construct a custom wrapper class around the user's handler_class
+    wrapper_class = type(
+        handler_class.__name__ + "Handler",
+        (_StreamHandlerWrapper,),
+        {'DELEGATE_CLASS': handler_class}
+    )
+
+    server = socketserver.ThreadingTCPServer((bind_addr, port), wrapper_class)
     try:
         log.info("Serving %s on (%s, %s)", handler_class.__name__, bind_addr, port)
         server.serve_forever()
diff --git a/pyls/python_ls.py b/pyls/python_ls.py
@@ -29,9 +29,6 @@ class PythonLanguageServer(LanguageServer):
     REFERENCES = JediReferencesProvider
     SIGNATURE = JediSignatureProvider
 
-    def __init__(self, *args, **kwargs):
-        super(PythonLanguageServer, self).__init__(*args, **kwargs)
-
     def capabilities(self):
         # TODO: support incremental sync instead of full
         return {
diff --git a/pyls/server.py b/pyls/server.py
@@ -2,13 +2,12 @@
 import json
 import logging
 import re
-import socketserver
 import jsonrpc
 
 log = logging.getLogger(__name__)
 
 
-class JSONRPCServer(socketserver.StreamRequestHandler, object):
+class JSONRPCServer(object):
     """ Read/Write JSON RPC messages """
 
     def __init__(self, rfile, wfile):
diff --git a/vscode-client/src/extension.ts b/vscode-client/src/extension.ts
@@ -41,6 +41,6 @@ function startLangServerTCP(addr: number, documentSelector: string | string[]):
 export function activate(context: ExtensionContext) {
     context.subscriptions.push(startLangServer("pyls", ["python"]));
     // For TCP
-    // context.subscriptions.push(startLangServerTCP(2087, ["pyls"]));
+    // context.subscriptions.push(startLangServerTCP(2087, ["python"]));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ function startLangServerTCP(addr: number, documentSelector: string \| string[]):`
`41`	`41`	`export function activate(context: ExtensionContext) {`
`42`	`42`	`context.subscriptions.push(startLangServer("pyls", ["python"]));`
`43`	`43`	`// For TCP`
`44`		`- // context.subscriptions.push(startLangServerTCP(2087, ["pyls"]));`
	`44`	`+ // context.subscriptions.push(startLangServerTCP(2087, ["python"]));`
`45`	`45`	`}`
`46`	`46`