Skip to content

Commit 3575d2a

Browse files
committed
Provide better error messages if python and robot environment not matches RobotCode requirements, fixes #40
1 parent d850c8f commit 3575d2a

24 files changed

+605
-491
lines changed

CHANGELOG.md

Lines changed: 455 additions & 452 deletions
Large diffs are not rendered by default.

robotcode/jsonrpc2/server.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
Callable,
1111
Coroutine,
1212
Generic,
13-
Literal,
1413
NamedTuple,
1514
Optional,
1615
Type,
@@ -147,7 +146,7 @@ async def __aexit__(
147146
exception_type: Optional[Type[BaseException]],
148147
exception_value: Optional[BaseException],
149148
traceback: Optional[TracebackType],
150-
) -> Literal[False]:
149+
) -> bool:
151150
await self.close_async()
152151
return False
153152

@@ -160,9 +159,8 @@ def __exit__(
160159
exception_type: Optional[Type[BaseException]],
161160
exception_value: Optional[BaseException],
162161
traceback: Optional[TracebackType],
163-
) -> Literal[False]:
162+
) -> None:
164163
self.close()
165-
return False
166164

167165
@abc.abstractmethod
168166
def create_protocol(self) -> TProtocol:

robotcode/language_server/robotframework/diagnostics/analyzer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
)
1919
from ...common.text_document import TextDocument
2020
from ..parts.model_helper import ModelHelperMixin
21-
from ..utils.ast import (
21+
from ..utils.ast_utils import (
2222
HasTokens,
2323
Statement,
2424
Token,

robotcode/language_server/robotframework/diagnostics/entities.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from typing import Any, Optional, Tuple
44

55
from ...common.lsp_types import Position, Range
6-
from ..utils.ast import Token
6+
from ..utils.ast_utils import Token
77

88

99
@dataclass

robotcode/language_server/robotframework/diagnostics/imports_manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ async def get_libdoc_from_model(
807807
from robot.running.usererrorhandler import UserErrorHandler
808808
from robot.running.userkeyword import UserLibrary
809809

810-
from ..utils.ast import HasError, HasErrors
810+
from ..utils.ast_utils import HasError, HasErrors
811811

812812
errors: List[Error] = []
813813

robotcode/language_server/robotframework/diagnostics/namespace.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
Range,
4040
)
4141
from ...common.text_document import TextDocument
42-
from ..utils.ast import (
42+
from ..utils.ast_utils import (
4343
Token,
4444
range_from_node,
4545
range_from_token,

robotcode/language_server/robotframework/parts/codelens.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from ...common.decorators import language_id
99
from ...common.lsp_types import CodeLens, Command
1010
from ...common.text_document import TextDocument
11-
from ..utils.ast import range_from_token
11+
from ..utils.ast_utils import range_from_token
1212

1313
if TYPE_CHECKING:
1414
from ..protocol import RobotLanguageServerProtocol

robotcode/language_server/robotframework/parts/completion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
KeywordMatcher,
4949
)
5050
from ..diagnostics.namespace import Namespace
51-
from ..utils.ast import (
51+
from ..utils.ast_utils import (
5252
HasTokens,
5353
Token,
5454
get_nodes_at_position,

robotcode/language_server/robotframework/parts/debugging_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from ....utils.async_tools import run_coroutine_in_thread
1010
from ....utils.logging import LoggingDescriptor
1111
from ...common.lsp_types import Model, Position, Range, TextDocumentIdentifier
12-
from ..utils.ast import (
12+
from ..utils.ast_utils import (
1313
HasTokens,
1414
Statement,
1515
Token,

robotcode/language_server/robotframework/parts/diagnostics.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@
1111
from ...common.parts.diagnostics import DiagnosticsResult
1212
from ...common.text_document import TextDocument
1313
from ..diagnostics.analyzer import Analyzer
14-
from ..utils.ast import HeaderAndBodyBlock, Token, range_from_node, range_from_token
14+
from ..utils.ast_utils import (
15+
HeaderAndBodyBlock,
16+
Token,
17+
range_from_node,
18+
range_from_token,
19+
)
1520

1621
if TYPE_CHECKING:
1722
from ..protocol import RobotLanguageServerProtocol
@@ -172,7 +177,7 @@ async def collect_token_errors(self, sender: Any, document: TextDocument) -> Dia
172177
@_logger.call
173178
async def collect_model_errors(self, sender: Any, document: TextDocument) -> DiagnosticsResult:
174179

175-
from ..utils.ast import HasError, HasErrors
180+
from ..utils.ast_utils import HasError, HasErrors
176181
from ..utils.async_ast import iter_nodes
177182

178183
try:

0 commit comments

Comments
 (0)