Change imports to use SolidLanguageServer instead of SyncLanguageServer

src/serena/agent.py

@@ -33,7 +33,7 @@ from sensai.util import logging
 from sensai.util.logging import LOG_DEFAULT_FORMAT, FallbackHandler
 from sensai.util.string import ToStringMixin, dict_string
 
-from multilspy import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from serena import serena_version
 from serena.config import SerenaAgentContext, SerenaAgentMode
 from serena.constants import (

src/serena/symbol.py

@@ -9,8 +9,8 @@ from typing import TYPE_CHECKING, Any, Literal, NamedTuple, Self, Union
 
 from sensai.util.string import ToStringMixin
 
-from multilspy import SyncLanguageServer
-from multilspy.language_server import ReferenceInSymbol as LSPReferenceInSymbol
+from solidlsp import SolidLanguageServer as SyncLanguageServer
+from solidlsp.ls import ReferenceInSymbol as LSPReferenceInSymbol
 from solidlsp.multilspy_types import Position, SymbolKind, UnifiedSymbolInformation
 
 if TYPE_CHECKING:

src/solidlsp/__init__.py

@@ -0,0 +1 @@
+from .ls import SolidLanguageServer

test/conftest.py

@@ -5,7 +5,7 @@ from typing import cast
 import pytest
 from sensai.util.logging import configure
 
-from multilspy.language_server import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from serena.constants import USE_SOLID_LSP
 from serena.util.file_system import GitignoreParser
 from solidlsp.ls import SolidLanguageServer

test/multilspy/go/test_go_basic.py

@@ -2,7 +2,7 @@ import os
 
 import pytest
 
-from multilspy import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 from solidlsp.multilspy_utils import SymbolUtils
 

test/multilspy/java/test_java_basic.py

@@ -2,7 +2,7 @@ import os
 
 import pytest
 
-from multilspy import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 from solidlsp.multilspy_utils import SymbolUtils
 

test/multilspy/php/test_php_basic.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 import pytest
 
-from multilspy.language_server import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 
 

test/multilspy/python/test_python_basic.py

@@ -9,7 +9,7 @@ import os
 
 import pytest
 
-from multilspy.language_server import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from serena.text_utils import LineType
 from solidlsp.multilspy_config import Language
 

test/multilspy/python/test_retrieval_with_ignored_dirs.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 import pytest
 
-from multilspy.language_server import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 from test.conftest import create_ls
 

test/multilspy/python/test_symbol_retrieval.py

@@ -10,7 +10,7 @@ import os
 
 import pytest
 
-from multilspy.language_server import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 from solidlsp.multilspy_types import SymbolKind
 

test/multilspy/rust/test_rust_basic.py

@@ -2,7 +2,7 @@ import os
 
 import pytest
 
-from multilspy import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 from solidlsp.multilspy_utils import SymbolUtils
 

test/multilspy/typescript/test_typescript_basic.py

@@ -2,7 +2,7 @@ import os
 
 import pytest
 
-from multilspy import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 from solidlsp.multilspy_utils import SymbolUtils