undo pysa specific changes back to refactor only

Author: m0mosenpai

client/commands/v2/persistent.py

@@ -32,7 +32,6 @@
     incremental,
     server_event,
 )
-from api import query
 
 LOG: logging.Logger = logging.getLogger(__name__)
 
@@ -503,36 +502,6 @@ def type_errors_to_diagnostics(
     return result
 
 
-def invalid_model_to_diagnostic(
-    invalid_model: query.InvalidModel,
-) -> lsp.Diagnostic:
-    return lsp.Diagnostic(
-        range=lsp.Range(
-            start=lsp.Position(
-                line=invalid_model.line - 1, character=invalid_model.column
-            ),
-            end=lsp.Position(
-                line=invalid_model.stop_line - 1, character=invalid_model.stop_column
-            ),
-        ),
-        message=invalid_model.full_error_message,
-        severity=lsp.DiagnosticSeverity.ERROR,
-        code=None,
-        source="Pysa",
-    )
-
-
-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)
-        )
-    return result
-
-
 class PyreServerHandler(connection.BackgroundTask):
     binary_location: str
     server_identifier: str

client/commands/v2/pysa_server.py

@@ -32,8 +32,6 @@
     InitializationSuccess,
     InitializationFailure,
 )
-from api import query, connection as api_connection
-from api.connection import PyreQueryError
 
 LOG: logging.Logger = logging.getLogger(__name__)
 
@@ -62,18 +60,6 @@ def __init__(
         self.binary_location = binary_location
         self.server_identifier = server_identifier
 
-    async def update_errors(self, document_path) -> None:
-        await _publish_diagnostics(self.output_channel, document_path, [])
-        pyre_connection = api_connection.PyreConnection(
-            Path(self.pyre_arguments.global_root)
-        )
-        try:
-            model_errors = query.get_invalid_taint_models(pyre_connection)
-            diagnostics = invalid_models_to_diagnostics(model_errors)
-            await self.show_model_errors_to_client(diagnostics)
-        except PyreQueryError as e:
-            await self.log_and_show_message_to_client(f"Error querying Pyre: {e}", lsp.MessageType.WARNING)
-
     async def show_message_to_client(
         self, message: str, level: lsp.MessageType = lsp.MessageType.INFO
     ) -> None:
@@ -121,8 +107,6 @@ async def process_open_request(
                 f"Document URI is not a file: {parameters.text_document.uri}"
             )
 
-        await self.update_errors(document_path)
-
     async def process_close_request(
         self, parameters: lsp.DidCloseTextDocumentParameters
     ) -> None:
@@ -145,7 +129,6 @@ async def process_did_save_request(
             raise json_rpc.InvalidRequestError(
                 f"Document URI is not a file: {parameters.text_document.uri}"
             )
-        await self.update_errors(document_path)
 
     async def run(self) -> int:
         while True:
@@ -233,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 = (