Skip to content

Commit 5bab97c

Browse files
committed
fix(analyse): allow local variables in [Teardown]
1 parent 23df33c commit 5bab97c

File tree

37 files changed

+491
-2
lines changed

37 files changed

+491
-2
lines changed

packages/robot/src/robotcode/robot/diagnostics/namespace.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from robot.libraries import STDLIBS
2828
from robot.parsing.lexer.tokens import Token
2929
from robot.parsing.model.blocks import Keyword, SettingSection, TestCase, VariableSection
30-
from robot.parsing.model.statements import Arguments, Fixture, Statement, Timeout
30+
from robot.parsing.model.statements import Arguments, Setup, Statement, Timeout
3131
from robot.parsing.model.statements import LibraryImport as RobotLibraryImport
3232
from robot.parsing.model.statements import ResourceImport as RobotResourceImport
3333
from robot.parsing.model.statements import (
@@ -1039,7 +1039,7 @@ def yield_variables(
10391039

10401040
in_args = isinstance(test_or_keyword_nodes[-1], Arguments) if test_or_keyword_nodes else False
10411041
only_args = (
1042-
isinstance(test_or_keyword_nodes[-1], (Arguments, Fixture, Timeout)) if test_or_keyword_nodes else False
1042+
isinstance(test_or_keyword_nodes[-1], (Arguments, Setup, Timeout)) if test_or_keyword_nodes else False
10431043
)
10441044

10451045
for var in chain(

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-036-004-simple_keyword_call].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,6 +1542,15 @@ result:
15421542
character: 4
15431543
line: 203
15441544
uri: tests/references.robot
1545+
- !Location
1546+
range:
1547+
end:
1548+
character: 21
1549+
line: 206
1550+
start:
1551+
character: 18
1552+
line: 206
1553+
uri: tests/references.robot
15451554
- !Location
15461555
range:
15471556
end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-036-005-simple_keyword_call].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,6 +1542,15 @@ result:
15421542
character: 4
15431543
line: 203
15441544
uri: tests/references.robot
1545+
- !Location
1546+
range:
1547+
end:
1548+
character: 21
1549+
line: 206
1550+
start:
1551+
character: 18
1552+
line: 206
1553+
uri: tests/references.robot
15451554
- !Location
15461555
range:
15471556
end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_references.test[references.robot-036-006-simple_keyword_call].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,6 +1542,15 @@ result:
15421542
character: 4
15431543
line: 203
15441544
uri: tests/references.robot
1545+
- !Location
1546+
range:
1547+
end:
1548+
character: 21
1549+
line: 206
1550+
start:
1551+
character: 18
1552+
line: 206
1553+
uri: tests/references.robot
15451554
- !Location
15461555
range:
15471556
end:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
data: !GeneratedTestData
2+
character: 27
3+
line: 206
4+
name: a local variable in teardown
5+
result: null
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
data: !GeneratedTestData
2+
character: 30
3+
line: 206
4+
name: a local variable in teardown
5+
result: null
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
data: !GeneratedTestData
2+
character: 32
3+
line: 206
4+
name: a local variable in teardown
5+
result: null

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_semantic_tokens.test[references.robot].out

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2725,4 +2725,59 @@ result: !SemanticTokens
27252725
- 1
27262726
- 48
27272727
- 0
2728+
- 2
2729+
- 4
2730+
- 2
2731+
- 47
2732+
- 0
2733+
- 0
2734+
- 8
2735+
- 1
2736+
- 48
2737+
- 0
2738+
- 0
2739+
- 5
2740+
- 12
2741+
- 39
2742+
- 1024
2743+
- 1
2744+
- 4
2745+
- 1
2746+
- 21
2747+
- 0
2748+
- 0
2749+
- 1
2750+
- 8
2751+
- 25
2752+
- 0
2753+
- 0
2754+
- 8
2755+
- 1
2756+
- 21
2757+
- 0
2758+
- 0
2759+
- 5
2760+
- 3
2761+
- 42
2762+
- 1024
2763+
- 0
2764+
- 7
2765+
- 2
2766+
- 47
2767+
- 0
2768+
- 0
2769+
- 8
2770+
- 1
2771+
- 48
2772+
- 0
2773+
- 1
2774+
- 0
2775+
- 1
2776+
- 17
2777+
- 0
2778+
- 0
2779+
- 27
2780+
- 35
2781+
- 17
2782+
- 0
27282783
result_id: null

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf50/test_references.test[references.robot-036-004-simple_keyword_call].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,6 +1704,15 @@ result:
17041704
character: 4
17051705
line: 203
17061706
uri: tests/references.robot
1707+
- !Location
1708+
range:
1709+
end:
1710+
character: 21
1711+
line: 206
1712+
start:
1713+
character: 18
1714+
line: 206
1715+
uri: tests/references.robot
17071716
- !Location
17081717
range:
17091718
end:

tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf50/test_references.test[references.robot-036-005-simple_keyword_call].out

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,6 +1704,15 @@ result:
17041704
character: 4
17051705
line: 203
17061706
uri: tests/references.robot
1707+
- !Location
1708+
range:
1709+
end:
1710+
character: 21
1711+
line: 206
1712+
start:
1713+
character: 18
1714+
line: 206
1715+
uri: tests/references.robot
17071716
- !Location
17081717
range:
17091718
end:

0 commit comments

Comments
 (0)