removed PysaServerHandler, refactored things into PysaServer class

Author: m0mosenpai

client/commands/v2/persistent.py

@@ -507,8 +507,6 @@ def type_errors_to_diagnostics(
     return result
 
 
-# ** NEW **
-# Convert InvalidModel to Diagnostic object
 def invalid_model_to_diagnostic(
     invalid_model: query.InvalidModel,
 ) -> lsp.Diagnostic:
@@ -528,15 +526,14 @@ def invalid_model_to_diagnostic(
     )
 
 
-# ** NEW **
-# Convert list of InvalidModels to list of Diagnostics
 def invalid_models_to_diagnostics(
     invalid_models: Sequence[query.InvalidModel],
 ) -> Dict[Path, List[lsp.Diagnostic]]:
     result: Dict[Path, List[lsp.Diagnostic]] = {}
     for model in invalid_models:
-        result.setdefault(Path(model.path), []).append(invalid_model_to_diagnostic(model))
-    # LOG.info(f"invalid_models_to_diagnostics(): result = {result}")
+        result.setdefault(Path(model.path), []).append(
+            invalid_model_to_diagnostic(model)
+        )
     return result
 
 

client/commands/v2/pysa_server.py

@@ -35,8 +35,6 @@
 
 LOG: logging.Logger = logging.getLogger(__name__)
 
-PYSA_HANDLER_OBJ: None
-
 
 class PysaServer:
     # I/O Channels
@@ -103,7 +101,6 @@ async def wait_for_exit(self) -> int:
     async def process_open_request(
         self, parameters: lsp.DidOpenTextDocumentParameters
     ) -> None:
-        # LOG.info("** Inside process_open_request() **")
         document_path = parameters.text_document.document_uri().to_file_path()
         if document_path is None:
             raise json_rpc.InvalidRequestError(
@@ -113,7 +110,6 @@ async def process_open_request(
     async def process_close_request(
         self, parameters: lsp.DidCloseTextDocumentParameters
     ) -> None:
-        # LOG.info("** Inside process_close_request() **")
         document_path = parameters.text_document.document_uri().to_file_path()
         if document_path is None:
             raise json_rpc.InvalidRequestError(
@@ -128,7 +124,6 @@ async def process_close_request(
     async def process_did_save_request(
         self, parameters: lsp.DidSaveTextDocumentParameters
     ) -> None:
-        # LOG.info("** Inside process_did_save_request() **")
         document_path = parameters.text_document.document_uri().to_file_path()
         if document_path is None:
             raise json_rpc.InvalidRequestError(
@@ -150,7 +145,6 @@ async def run(self) -> int:
                     )
                     return await self.wait_for_exit()
                 elif request.method == "textDocument/didOpen":
-                    # LOG.info("** A Document just opened! **")
                     parameters = request.parameters
                     if parameters is None:
                         raise json_rpc.InvalidRequestError(
@@ -162,7 +156,6 @@ async def run(self) -> int:
                         )
                     )
                 elif request.method == "textDocument/didClose":
-                    # LOG.info("** A Document just closed! **")
                     parameters = request.parameters
                     if parameters is None:
                         raise json_rpc.InvalidRequestError(
@@ -174,7 +167,6 @@ async def run(self) -> int:
                         )
                     )
                 elif request.method == "textDocument/didSave":
-                    # LOG.info("** A Document just saved! **")
                     parameters = request.parameters
                     if parameters is None:
                         raise json_rpc.InvalidRequestError(
@@ -192,7 +184,6 @@ async def run(self) -> int:
 async def run_persistent(
     binary_location: str, server_identifier: str, pysa_arguments: start.Arguments
 ) -> int:
-    global PYSA_HANDLER_OBJ
     stdin, stdout = await connection.create_async_stdin_stdout()
     while True:
         initialize_result = await try_initialize(stdin, stdout)
@@ -225,7 +216,7 @@ async def run_persistent(
                 server_identifier=server_identifier,
                 pyre_arguments=pysa_arguments,
             )
-            return await server.run()
+            return await server._run()
         elif isinstance(initialize_result, InitializationFailure):
             exception = initialize_result.exception
             message = (