Formatting, removing mentions of multilspy in pyproject

pyproject.toml

@@ -73,7 +73,7 @@ google = [
 Homepage = "https://github.com/oraios/serena"
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/serena", "src/multilspy", "src/interprompt", "src/solidlsp"]
+packages = ["src/serena", "src/interprompt", "src/solidlsp"]
 
 [tool.black]
 line-length = 140
@@ -82,7 +82,7 @@ target-version = [
 ]
 exclude = '''
 /(
-    src/multilspy
+    src/solidlsp/language_servers/.*/static,
 )/
 '''
 
@@ -138,7 +138,7 @@ type-check = [
 target-version = "py311"
 line-length = 140
 exclude = [
-  "src/multilspy",
+    "src/solidlsp/language_servers/**/static",
 ]
 
 [tool.ruff.format]

src/solidlsp/language_servers/clangd_language_server/clangd_language_server.py

@@ -10,11 +10,11 @@ import stat
 import threading
 
 from solidlsp.ls import SolidLanguageServer
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_logger import LanguageServerLogger
 from solidlsp.ls_utils import FileUtils, PlatformUtils
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
 
 class ClangdLanguageServer(SolidLanguageServer):

src/solidlsp/language_servers/dart_language_server/dart_language_server.py

@@ -5,9 +5,9 @@ import pathlib
 import stat
 
 from solidlsp.ls import SolidLanguageServer
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 from solidlsp.ls_logger import LanguageServerLogger
 from solidlsp.ls_utils import FileUtils, PlatformUtils
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
 
 class DartLanguageServer(SolidLanguageServer):

src/solidlsp/language_servers/eclipse_jdtls/eclipse_jdtls.py

@@ -16,12 +16,12 @@ from pathlib import PurePath
 from overrides import override
 
 from solidlsp.ls import SolidLanguageServer
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_logger import LanguageServerLogger
-from solidlsp.settings import SolidLSPSettings
 from solidlsp.ls_utils import FileUtils, PlatformUtils
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
+from solidlsp.settings import SolidLSPSettings
 
 
 @dataclasses.dataclass

src/solidlsp/language_servers/gopls/gopls.py

@@ -8,10 +8,10 @@ import threading
 from overrides import override
 
 from solidlsp.ls import SolidLanguageServer
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_logger import LanguageServerLogger
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
 
 class Gopls(SolidLanguageServer):

src/solidlsp/language_servers/intelephense/intelephense.py

@@ -13,11 +13,11 @@ from time import sleep
 from overrides import override
 
 from solidlsp.ls import SolidLanguageServer
-from solidlsp.lsp_protocol_handler.lsp_types import DefinitionParams, InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_logger import LanguageServerLogger
 from solidlsp.ls_utils import PlatformId, PlatformUtils
+from solidlsp.lsp_protocol_handler.lsp_types import DefinitionParams, InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
 
 class Intelephense(SolidLanguageServer):

src/solidlsp/language_servers/jedi_language_server/jedi_server.py

@@ -10,10 +10,10 @@ import pathlib
 from overrides import override
 
 from solidlsp.ls import SolidLanguageServer
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_logger import LanguageServerLogger
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
 
 class JediServer(SolidLanguageServer):

src/solidlsp/language_servers/kotlin_language_server/kotlin_language_server.py

@@ -10,11 +10,11 @@ import pathlib
 import stat
 
 from solidlsp.ls import SolidLanguageServer
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_logger import LanguageServerLogger
 from solidlsp.ls_utils import FileUtils, PlatformUtils
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
 
 @dataclasses.dataclass

src/solidlsp/language_servers/omnisharp/omnisharp.py

@@ -13,12 +13,12 @@ from collections.abc import Iterable
 from overrides import override
 
 from solidlsp.ls import SolidLanguageServer
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_exceptions import LanguageServerException
 from solidlsp.ls_logger import LanguageServerLogger
 from solidlsp.ls_utils import DotnetVersion, FileUtils, PlatformId, PlatformUtils
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
 
 def breadth_first_file_scan(root) -> Iterable[str]:

src/solidlsp/language_servers/pyright_language_server/pyright_server.py

@@ -11,10 +11,10 @@ import threading
 from overrides import override
 
 from solidlsp.ls import SolidLanguageServer
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_logger import LanguageServerLogger
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
 
 class PyrightServer(SolidLanguageServer):

src/solidlsp/language_servers/rust_analyzer/rust_analyzer.py

@@ -12,11 +12,11 @@ import threading
 from overrides import override
 
 from solidlsp.ls import SolidLanguageServer
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_logger import LanguageServerLogger
 from solidlsp.ls_utils import FileUtils, PlatformUtils
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
 
 class RustAnalyzer(SolidLanguageServer):

src/solidlsp/language_servers/solargraph/solargraph.py

@@ -13,10 +13,10 @@ import threading
 from typing import override
 
 from solidlsp.ls import SolidLanguageServer
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_logger import LanguageServerLogger
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
 
 class Solargraph(SolidLanguageServer):

src/solidlsp/language_servers/typescript_language_server/typescript_language_server.py

@@ -14,11 +14,11 @@ from time import sleep
 from overrides import override
 
 from solidlsp.ls import SolidLanguageServer
-from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
-from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 from solidlsp.ls_config import LanguageServerConfig
 from solidlsp.ls_logger import LanguageServerLogger
 from solidlsp.ls_utils import PlatformId, PlatformUtils
+from solidlsp.lsp_protocol_handler.lsp_types import InitializeParams
+from solidlsp.lsp_protocol_handler.server import ProcessLaunchInfo
 
 # Platform-specific imports
 if os.name != "nt":  # Unix-like systems

src/solidlsp/ls.py

@@ -20,7 +20,11 @@ import tqdm
 
 from serena.text_utils import MatchedConsecutiveLines, search_files
 from solidlsp import ls_types
+from solidlsp.ls_config import Language, LanguageServerConfig
+from solidlsp.ls_exceptions import LanguageServerException
 from solidlsp.ls_handler import SolidLanguageServerHandler
+from solidlsp.ls_logger import LanguageServerLogger
+from solidlsp.ls_utils import FileUtils, PathUtils, TextUtils
 from solidlsp.lsp_protocol_handler import lsp_types
 from solidlsp.lsp_protocol_handler import lsp_types as LSPTypes
 from solidlsp.lsp_protocol_handler.lsp_constants import LSPConstants
@@ -30,10 +34,6 @@ from solidlsp.lsp_protocol_handler.server import (
     ProcessLaunchInfo,
     StringDict,
 )
-from solidlsp.ls_config import Language, LanguageServerConfig
-from solidlsp.ls_exceptions import LanguageServerException
-from solidlsp.ls_logger import LanguageServerLogger
-from solidlsp.ls_utils import FileUtils, PathUtils, TextUtils
 
 GenericDocumentSymbol = Union[LSPTypes.DocumentSymbol, LSPTypes.SymbolInformation, ls_types.UnifiedSymbolInformation]
 
@@ -409,9 +409,7 @@ class SolidLanguageServer(ABC):
             )
             del self.open_file_buffers[uri]
 
-    def insert_text_at_position(
-        self, relative_file_path: str, line: int, column: int, text_to_be_inserted: str
-    ) -> ls_types.Position:
+    def insert_text_at_position(self, relative_file_path: str, line: int, column: int, text_to_be_inserted: str) -> ls_types.Position:
         """
         Insert text at the given line and column in the given file and return
         the updated cursor position after inserting the text.
@@ -1035,9 +1033,7 @@ class SolidLanguageServer(ABC):
         lines = file_content.split("\n")
         end_line = len(lines)
         end_column = len(lines[-1])
-        return ls_types.Range(
-            start=ls_types.Position(line=0, character=0), end=ls_types.Position(line=end_line, character=end_column)
-        )
+        return ls_types.Range(start=ls_types.Position(line=0, character=0), end=ls_types.Position(line=end_line, character=end_column))
 
     def request_dir_overview(self, relative_dir_path: str) -> dict[str, list[tuple[str, ls_types.SymbolKind, int, int]]]:
         """
@@ -1139,9 +1135,7 @@ class SolidLanguageServer(ABC):
 
     # ----------------------------- FROM HERE ON MODIFICATIONS BY MISCHA --------------------
 
-    def retrieve_symbol_body(
-        self, symbol: ls_types.UnifiedSymbolInformation | LSPTypes.DocumentSymbol | LSPTypes.SymbolInformation
-    ) -> str:
+    def retrieve_symbol_body(self, symbol: ls_types.UnifiedSymbolInformation | LSPTypes.DocumentSymbol | LSPTypes.SymbolInformation) -> str:
         """
         Load the body of the given symbol. If the body is already contained in the symbol, just return it.
         """

src/solidlsp/ls_handler.py

@@ -12,6 +12,8 @@ from typing import Any
 
 import psutil
 
+from solidlsp.ls_exceptions import LanguageServerException
+from solidlsp.ls_request import LanguageServerRequest
 from solidlsp.lsp_protocol_handler.lsp_requests import LspNotification
 from solidlsp.lsp_protocol_handler.lsp_types import ErrorCodes
 from solidlsp.lsp_protocol_handler.server import (
@@ -28,8 +30,6 @@ from solidlsp.lsp_protocol_handler.server import (
     make_request,
     make_response,
 )
-from solidlsp.ls_request import LanguageServerRequest
-from solidlsp.ls_exceptions import LanguageServerException
 
 log = logging.getLogger(__name__)
 

src/solidlsp/ls_utils.py

@@ -54,7 +54,7 @@ class TextUtils:
         idx = 0
         while line > 0:
             if idx >= len(text):
-                raise InvalidTextLocationError()
+                raise InvalidTextLocationError
             if text[idx] == "\n":
                 line -= 1
             idx += 1
@@ -95,7 +95,7 @@ class TextUtils:
         """
         try:
             change_index = TextUtils.get_index_from_line_col(text, line, col)
-        except InvalidTextLocationError as e:
+        except InvalidTextLocationError:
             num_lines_in_text = text.count("\n") + 1
             max_line = num_lines_in_text - 1
             if line == max_line + 1 and col == 0:  # trying to insert at new line after full text

src/solidlsp/lsp_protocol_handler/server.py

@@ -28,19 +28,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
 
-import asyncio
 import dataclasses
 import json
 import logging
 import os
-import threading
-from collections.abc import Callable
 from typing import Any, Union
 
-import psutil
-
-from ..ls_exceptions import LanguageServerException
-from .lsp_requests import LspNotification, LspRequest
 from .lsp_types import ErrorCodes
 
 StringDict = dict[str, Any]
@@ -127,4 +120,3 @@ def content_length(line: bytes) -> int | None:
         except ValueError:
             raise ValueError(f"Invalid Content-Length header: {value}")
     return None
-