Skip to content

Commit 9c33bad

Browse files
committed
fix: support pygls v2 LanguageServer import
1 parent 9bc9d75 commit 9c33bad

File tree

5 files changed

+20
-5
lines changed

5 files changed

+20
-5
lines changed

slither_lsp/app/logging/lsp_handler.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
from logging import Handler, LogRecord, FATAL, ERROR, WARNING, INFO, DEBUG, NOTSET
2-
from pygls.server import LanguageServer
2+
try:
3+
from pygls.server import LanguageServer
4+
except ImportError:
5+
from pygls.lsp.server import LanguageServer
36
from lsprotocol.types import MessageType
47

58
_level_to_type = {

slither_lsp/app/request_handlers/analysis/get_detector_list.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# pylint: disable=unused-argument
22

3-
from pygls.server import LanguageServer
3+
try:
4+
from pygls.server import LanguageServer
5+
except ImportError:
6+
from pygls.lsp.server import LanguageServer
47
from slither.__main__ import get_detectors_and_printers, output_detectors_json
58

69

slither_lsp/app/request_handlers/analysis/get_version.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
from importlib.metadata import version as pkg_version
44

5-
from pygls.server import LanguageServer
5+
try:
6+
from pygls.server import LanguageServer
7+
except ImportError:
8+
from pygls.lsp.server import LanguageServer
69

710

811
def get_version(ls: LanguageServer, params):

slither_lsp/app/request_handlers/compilation/get_command_line_args.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
from argparse import ArgumentParser
44

55
from crytic_compile.cryticparser.cryticparser import init as crytic_parser_init
6-
from pygls.server import LanguageServer
6+
try:
7+
from pygls.server import LanguageServer
8+
except ImportError:
9+
from pygls.lsp.server import LanguageServer
710

811

912
def get_command_line_args(ls: LanguageServer, params):

slither_lsp/app/slither_server.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
from crytic_compile.crytic_compile import CryticCompile
1313
from pygls.lsp import METHOD_TO_OPTIONS
1414
from pygls.protocol import LanguageServerProtocol
15-
from pygls.server import LanguageServer
15+
try:
16+
from pygls.server import LanguageServer
17+
except ImportError:
18+
from pygls.lsp.server import LanguageServer
1619
from slither import Slither
1720
from slither.__main__ import (
1821
_process as process_detectors_and_printers,

0 commit comments

Comments
 (0)