Skip to content

Commit 1bcef86

Browse files
committed
fix(langserver): correct detection of valid nodes in quickfixes for TRY/EXCEPT statements in RF5
1 parent 9ed33c9 commit 1bcef86

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

Diff for: packages/language_server/src/robotcode/language_server/robotframework/parts/code_action_refactor.py

+10-7
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,16 @@ def get_valid_nodes_in_range(self, model: ast.AST, range: Range, also_return: bo
152152
)
153153

154154
if get_robot_version() >= (5, 0, 0):
155-
from robot.parsing.model.statements import Break, Continue, ReturnStatement, WhileHeader
156-
157-
if get_robot_version() >= (6, 0, 0):
158155
from robot.parsing.model.blocks import Try
159-
from robot.parsing.model.statements import ExceptHeader, FinallyHeader, TryHeader
156+
from robot.parsing.model.statements import (
157+
Break,
158+
Continue,
159+
ExceptHeader,
160+
FinallyHeader,
161+
ReturnStatement,
162+
TryHeader,
163+
WhileHeader,
164+
)
160165

161166
if not isinstance(model, (Keyword, TestCase)):
162167
return []
@@ -232,9 +237,7 @@ def get_valid_nodes_in_range(self, model: ast.AST, range: Range, also_return: bo
232237
),
233238
)
234239
or get_robot_version() >= (5, 0)
235-
and isinstance(n, WhileHeader)
236-
or get_robot_version() >= (6, 0)
237-
and isinstance(n, (TryHeader, ExceptHeader, FinallyHeader))
240+
and isinstance(n, (WhileHeader, TryHeader, ExceptHeader, FinallyHeader))
238241
):
239242
return []
240243

0 commit comments

Comments
 (0)