Merge pull request #54 from yeger00/revert-52-type-inf

Revert "Add typing to public methods"

pylspclient/json_rpc_endpoint.py

@@ -2,7 +2,6 @@
 import json
 from pylspclient.lsp_errors import ErrorCodes, ResponseError 
 import threading
-from typing import BinaryIO
 
 JSON_RPC_REQ_FORMAT = "Content-Length: {json_string_len}\r\n\r\n{json_string}"
 LEN_HEADER = "Content-Length: "
@@ -16,7 +15,7 @@ class MyEncoder(json.JSONEncoder):
     """
     Encodes an object in JSON
     """
-    def default(self, o: object): # pylint: disable=E0202
+    def default(self, o): # pylint: disable=E0202
         return o.__dict__ 
 
 
@@ -25,14 +24,14 @@ class JsonRpcEndpoint(object):
     Thread safe JSON RPC endpoint implementation. Responsible to recieve and send JSON RPC messages, as described in the
     protocol. More information can be found: https://www.jsonrpc.org/
     '''
-    def __init__(self, stdin: BinaryIO, stdout: BinaryIO):
+    def __init__(self, stdin, stdout):
         self.stdin = stdin
         self.stdout = stdout
         self.read_lock = threading.Lock() 
         self.write_lock = threading.Lock() 
 
     @staticmethod
-    def __add_header(json_string: str) -> str:
+    def __add_header(json_string):
         '''
         Adds a header for the given json string
         
@@ -42,7 +41,7 @@ def __add_header(json_string: str) -> str:
         return JSON_RPC_REQ_FORMAT.format(json_string_len=len(json_string), json_string=json_string)
 
 
-    def send_request(self, message: any) -> None:
+    def send_request(self, message):
         '''
         Sends the given message.
 
@@ -55,7 +54,7 @@ def send_request(self, message: any) -> None:
             self.stdin.flush()
 
 
-    def recv_response(self) -> any:
+    def recv_response(self):
         '''        
         Recives a message.
 

pylspclient/lsp_client.py

@@ -15,16 +15,7 @@ def __init__(self, lsp_endpoint: LspEndpoint):
         self.lsp_endpoint = lsp_endpoint
 
 
-    def initialize(
-        self,
-        processId: Optional[int] = None,
-        rootPath: Optional[str] = None,
-        rootUri: Optional[str] = None,
-        initializationOptions: any = None,
-        capabilities: dict = None,
-        trace: Optional[str] = None,
-        workspaceFolders: Optional[list] = None
-    ) -> any:
+    def initialize(self, processId, rootPath, rootUri, initializationOptions, capabilities, trace, workspaceFolders):
         """
         The initialize request is sent as the first request from the client to the server. If the server receives a request or notification 
         before the initialize request it should act as follows:
@@ -42,16 +33,14 @@ def initialize(
         :param int processId: The process Id of the parent process that started the server. Is null if the process has not been started by another process.
                                 If the parent process is not alive then the server should exit (see exit notification) its process.
         :param str rootPath: The rootPath of the workspace. Is null if no folder is open. Deprecated in favour of rootUri.
-        :param str rootUri: The rootUri of the workspace. Is null if no folder is open. If both `rootPath` and `rootUri` are set
+        :param DocumentUri rootUri: The rootUri of the workspace. Is null if no folder is open. If both `rootPath` and `rootUri` are set
                                     `rootUri` wins.
         :param any initializationOptions: User provided initialization options.
         :param ClientCapabilities capabilities: The capabilities provided by the client (editor or tool).
         :param Trace trace: The initial trace setting. If omitted trace is disabled ('off').
         :param list workspaceFolders: The workspace folders configured in the client when the server starts. This property is only available if the client supports workspace folders.
                                         It can be `null` if the client supports workspace folders but none are configured.
         """
-        if not capabilities:
-             raise ValueError("capabilities must be provided")
         self.lsp_endpoint.start()
         return self.lsp_endpoint.call_method("initialize", processId=processId, rootPath=rootPath, rootUri=rootUri, initializationOptions=initializationOptions, capabilities=capabilities, trace=trace, workspaceFolders=workspaceFolders)
 

pylspclient/lsp_endpoint.py

@@ -1,18 +1,10 @@
 from __future__ import print_function
 import threading
 from pylspclient.lsp_errors import ErrorCodes, ResponseError
-from pylspclient import JsonRpcEndpoint
-from typing import Dict, Callable, Any, Union
 
 
 class LspEndpoint(threading.Thread):
-    def __init__(
-            self,
-            json_rpc_endpoint: JsonRpcEndpoint,
-            method_callbacks: Dict[str, Callable[[Any], Any]]={},
-            notify_callbacks: Dict[str, Callable[[Any], Any]]={},
-            timeout: int=2
-        ):
+    def __init__(self, json_rpc_endpoint, method_callbacks={}, notify_callbacks={}, timeout=2):
         threading.Thread.__init__(self)
         self.json_rpc_endpoint = json_rpc_endpoint
         self.notify_callbacks = notify_callbacks
@@ -32,7 +24,7 @@ def handle_result(self, rpc_id, result, error):
         cond.release()
 
 
-    def stop(self) -> None:
+    def stop(self):
         self.shutdown_flag = True
 
 
@@ -43,11 +35,11 @@ def run(self):
                 if jsonrpc_message is None:
                     print("server quit")
                     break
-                method: str = jsonrpc_message.get("method")
-                result: any = jsonrpc_message.get("result")
-                error: dict = jsonrpc_message.get("error")
-                rpc_id: Union[str, int] = jsonrpc_message.get("id")
-                params: Union[dict, list] = jsonrpc_message.get("params")
+                method = jsonrpc_message.get("method")
+                result = jsonrpc_message.get("result")
+                error = jsonrpc_message.get("error")
+                rpc_id = jsonrpc_message.get("id")
+                params = jsonrpc_message.get("params")
 
                 if method:
                     if rpc_id:
@@ -80,7 +72,7 @@ def send_response(self, id, result, error):
         self.json_rpc_endpoint.send_request(message_dict)
 
 
-    def send_message(self, method_name: str, params: dict, id: int=None):
+    def send_message(self, method_name, params, id = None):
         message_dict = {}
         message_dict["jsonrpc"] = "2.0"
         if id is not None: