Skip to content

Commit 3798c5e

Browse files
d-biehld-biehl
committed
fix(langserver): goto and implementation sometimes return to many wrong results on import statements
1 parent 6fe4dc0 commit 3798c5e

File tree

21 files changed

+2
-461
lines changed

21 files changed

+2
-461
lines changed

‎packages/language_server/src/robotcode/language_server/robotframework/parts/goto.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ async def collect(
116116
if found_range is not None:
117117
libdoc = ns.library_doc
118118

119-
if found_range == ns.import_range:
119+
if found_range == ns.import_range and str(document.uri.to_path()) == ns.import_source:
120120
if libdoc.source:
121121
result.append(
122122
LocationLink(
@@ -126,6 +126,7 @@ async def collect(
126126
target_selection_range=ns.library_doc.range,
127127
)
128128
)
129+
return result
129130
else:
130131
if ns.import_source:
131132
result.append(

‎tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_goto_definition.test_definition[goto.robot-001-018-Robot_Library_Import].out

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,3 @@ result:
2626
character: 0
2727
line: 825
2828
target_uri: Collections.py
29-
- !LocationLink
30-
origin_selection_range:
31-
end:
32-
character: 26
33-
line: 1
34-
start:
35-
character: 18
36-
line: 1
37-
target_range:
38-
end:
39-
character: 0
40-
line: 6
41-
start:
42-
character: 0
43-
line: 5
44-
target_selection_range:
45-
end:
46-
character: 0
47-
line: 6
48-
start:
49-
character: 0
50-
line: 5
51-
target_uri: alibrary.py

‎tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_goto_definition.test_definition[goto.robot-001-023-Robot_Library_Import].out

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,3 @@ result:
2626
character: 0
2727
line: 825
2828
target_uri: Collections.py
29-
- !LocationLink
30-
origin_selection_range:
31-
end:
32-
character: 26
33-
line: 1
34-
start:
35-
character: 18
36-
line: 1
37-
target_range:
38-
end:
39-
character: 0
40-
line: 6
41-
start:
42-
character: 0
43-
line: 5
44-
target_selection_range:
45-
end:
46-
character: 0
47-
line: 6
48-
start:
49-
character: 0
50-
line: 5
51-
target_uri: alibrary.py

‎tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_goto_implementation.test_implementation[goto.robot-001-018-Robot_Library_Import].out

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,3 @@ result:
2626
character: 0
2727
line: 825
2828
target_uri: Collections.py
29-
- !LocationLink
30-
origin_selection_range:
31-
end:
32-
character: 26
33-
line: 1
34-
start:
35-
character: 18
36-
line: 1
37-
target_range:
38-
end:
39-
character: 0
40-
line: 6
41-
start:
42-
character: 0
43-
line: 5
44-
target_selection_range:
45-
end:
46-
character: 0
47-
line: 6
48-
start:
49-
character: 0
50-
line: 5
51-
target_uri: alibrary.py

‎tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf41/test_goto_implementation.test_implementation[goto.robot-001-023-Robot_Library_Import].out

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,3 @@ result:
2626
character: 0
2727
line: 825
2828
target_uri: Collections.py
29-
- !LocationLink
30-
origin_selection_range:
31-
end:
32-
character: 26
33-
line: 1
34-
start:
35-
character: 18
36-
line: 1
37-
target_range:
38-
end:
39-
character: 0
40-
line: 6
41-
start:
42-
character: 0
43-
line: 5
44-
target_selection_range:
45-
end:
46-
character: 0
47-
line: 6
48-
start:
49-
character: 0
50-
line: 5
51-
target_uri: alibrary.py

‎tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf50/test_goto_definition.test_definition[goto.robot-001-018-Robot_Library_Import].out

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,3 @@ result:
2626
character: 0
2727
line: 827
2828
target_uri: Collections.py
29-
- !LocationLink
30-
origin_selection_range:
31-
end:
32-
character: 26
33-
line: 1
34-
start:
35-
character: 18
36-
line: 1
37-
target_range:
38-
end:
39-
character: 0
40-
line: 6
41-
start:
42-
character: 0
43-
line: 5
44-
target_selection_range:
45-
end:
46-
character: 0
47-
line: 6
48-
start:
49-
character: 0
50-
line: 5
51-
target_uri: alibrary.py

‎tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf50/test_goto_definition.test_definition[goto.robot-001-023-Robot_Library_Import].out

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,3 @@ result:
2626
character: 0
2727
line: 827
2828
target_uri: Collections.py
29-
- !LocationLink
30-
origin_selection_range:
31-
end:
32-
character: 26
33-
line: 1
34-
start:
35-
character: 18
36-
line: 1
37-
target_range:
38-
end:
39-
character: 0
40-
line: 6
41-
start:
42-
character: 0
43-
line: 5
44-
target_selection_range:
45-
end:
46-
character: 0
47-
line: 6
48-
start:
49-
character: 0
50-
line: 5
51-
target_uri: alibrary.py

‎tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf50/test_goto_implementation.test_implementation[goto.robot-001-018-Robot_Library_Import].out

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,3 @@ result:
2626
character: 0
2727
line: 827
2828
target_uri: Collections.py
29-
- !LocationLink
30-
origin_selection_range:
31-
end:
32-
character: 26
33-
line: 1
34-
start:
35-
character: 18
36-
line: 1
37-
target_range:
38-
end:
39-
character: 0
40-
line: 6
41-
start:
42-
character: 0
43-
line: 5
44-
target_selection_range:
45-
end:
46-
character: 0
47-
line: 6
48-
start:
49-
character: 0
50-
line: 5
51-
target_uri: alibrary.py

‎tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf50/test_goto_implementation.test_implementation[goto.robot-001-023-Robot_Library_Import].out

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,3 @@ result:
2626
character: 0
2727
line: 827
2828
target_uri: Collections.py
29-
- !LocationLink
30-
origin_selection_range:
31-
end:
32-
character: 26
33-
line: 1
34-
start:
35-
character: 18
36-
line: 1
37-
target_range:
38-
end:
39-
character: 0
40-
line: 6
41-
start:
42-
character: 0
43-
line: 5
44-
target_selection_range:
45-
end:
46-
character: 0
47-
line: 6
48-
start:
49-
character: 0
50-
line: 5
51-
target_uri: alibrary.py

‎tests/robotcode/language_server/robotframework/parts/_regtest_outputs/rf60/test_goto_definition.test_definition[goto.robot-001-018-Robot_Library_Import].out

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,3 @@ result:
2626
character: 0
2727
line: 838
2828
target_uri: Collections.py
29-
- !LocationLink
30-
origin_selection_range:
31-
end:
32-
character: 26
33-
line: 1
34-
start:
35-
character: 18
36-
line: 1
37-
target_range:
38-
end:
39-
character: 0
40-
line: 6
41-
start:
42-
character: 0
43-
line: 5
44-
target_selection_range:
45-
end:
46-
character: 0
47-
line: 6
48-
start:
49-
character: 0
50-
line: 5
51-
target_uri: alibrary.py

0 commit comments

Comments
 (0)