Skip to content

Commit 32a1492

Browse files
d-biehld-biehl
committed
fix(langserver): resolving of ${EXECDIR} and ${CURDIR} corrected
1 parent 38e34ca commit 32a1492

13 files changed

+2
-434
lines changed

‎packages/language_server/src/robotcode/language_server/robotframework/diagnostics/library_doc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,8 +1376,8 @@ def resolve_robot_variables(
13761376
result: Variables = _get_default_variables().copy()
13771377

13781378
for k, v in {
1379-
"${CURDIR}": str(Path(base_dir).resolve()),
1380-
"${EXECDIR}": str(Path(working_dir).resolve()),
1379+
"${CURDIR}": str(Path(base_dir).absolute()),
1380+
"${EXECDIR}": str(Path(working_dir).absolute()),
13811381
}.items():
13821382
result[k] = v
13831383

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,6 @@ result:
6666
character: 4
6767
line: 3
6868
uri: folder_a/duplicated.resource
69-
- !Location
70-
range:
71-
end:
72-
character: 7
73-
line: 3
74-
start:
75-
character: 4
76-
line: 3
77-
uri: folder_a/duplicated.resource
78-
- !Location
79-
range:
80-
end:
81-
character: 7
82-
line: 6
83-
start:
84-
character: 4
85-
line: 6
86-
uri: folder_a/duplicated.resource
8769
- !Location
8870
range:
8971
end:
@@ -102,24 +84,6 @@ result:
10284
character: 4
10385
line: 3
10486
uri: folder_b/duplicated.resource
105-
- !Location
106-
range:
107-
end:
108-
character: 7
109-
line: 3
110-
start:
111-
character: 4
112-
line: 3
113-
uri: folder_b/duplicated.resource
114-
- !Location
115-
range:
116-
end:
117-
character: 7
118-
line: 6
119-
start:
120-
character: 4
121-
line: 6
122-
uri: folder_b/duplicated.resource
12387
- !Location
12488
range:
12589
end:

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,6 @@ result:
6666
character: 4
6767
line: 3
6868
uri: folder_a/duplicated.resource
69-
- !Location
70-
range:
71-
end:
72-
character: 7
73-
line: 3
74-
start:
75-
character: 4
76-
line: 3
77-
uri: folder_a/duplicated.resource
78-
- !Location
79-
range:
80-
end:
81-
character: 7
82-
line: 6
83-
start:
84-
character: 4
85-
line: 6
86-
uri: folder_a/duplicated.resource
8769
- !Location
8870
range:
8971
end:
@@ -102,24 +84,6 @@ result:
10284
character: 4
10385
line: 3
10486
uri: folder_b/duplicated.resource
105-
- !Location
106-
range:
107-
end:
108-
character: 7
109-
line: 3
110-
start:
111-
character: 4
112-
line: 3
113-
uri: folder_b/duplicated.resource
114-
- !Location
115-
range:
116-
end:
117-
character: 7
118-
line: 6
119-
start:
120-
character: 4
121-
line: 6
122-
uri: folder_b/duplicated.resource
12387
- !Location
12488
range:
12589
end:

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,6 @@ result:
6666
character: 4
6767
line: 3
6868
uri: folder_a/duplicated.resource
69-
- !Location
70-
range:
71-
end:
72-
character: 7
73-
line: 3
74-
start:
75-
character: 4
76-
line: 3
77-
uri: folder_a/duplicated.resource
78-
- !Location
79-
range:
80-
end:
81-
character: 7
82-
line: 6
83-
start:
84-
character: 4
85-
line: 6
86-
uri: folder_a/duplicated.resource
8769
- !Location
8870
range:
8971
end:
@@ -102,24 +84,6 @@ result:
10284
character: 4
10385
line: 3
10486
uri: folder_b/duplicated.resource
105-
- !Location
106-
range:
107-
end:
108-
character: 7
109-
line: 3
110-
start:
111-
character: 4
112-
line: 3
113-
uri: folder_b/duplicated.resource
114-
- !Location
115-
range:
116-
end:
117-
character: 7
118-
line: 6
119-
start:
120-
character: 4
121-
line: 6
122-
uri: folder_b/duplicated.resource
12387
- !Location
12488
range:
12589
end:

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,6 @@ result:
6666
character: 4
6767
line: 3
6868
uri: folder_a/duplicated.resource
69-
- !Location
70-
range:
71-
end:
72-
character: 7
73-
line: 3
74-
start:
75-
character: 4
76-
line: 3
77-
uri: folder_a/duplicated.resource
78-
- !Location
79-
range:
80-
end:
81-
character: 7
82-
line: 6
83-
start:
84-
character: 4
85-
line: 6
86-
uri: folder_a/duplicated.resource
8769
- !Location
8870
range:
8971
end:
@@ -102,24 +84,6 @@ result:
10284
character: 4
10385
line: 3
10486
uri: folder_b/duplicated.resource
105-
- !Location
106-
range:
107-
end:
108-
character: 7
109-
line: 3
110-
start:
111-
character: 4
112-
line: 3
113-
uri: folder_b/duplicated.resource
114-
- !Location
115-
range:
116-
end:
117-
character: 7
118-
line: 6
119-
start:
120-
character: 4
121-
line: 6
122-
uri: folder_b/duplicated.resource
12387
- !Location
12488
range:
12589
end:

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,6 @@ result:
6666
character: 4
6767
line: 3
6868
uri: folder_a/duplicated.resource
69-
- !Location
70-
range:
71-
end:
72-
character: 7
73-
line: 3
74-
start:
75-
character: 4
76-
line: 3
77-
uri: folder_a/duplicated.resource
78-
- !Location
79-
range:
80-
end:
81-
character: 7
82-
line: 6
83-
start:
84-
character: 4
85-
line: 6
86-
uri: folder_a/duplicated.resource
8769
- !Location
8870
range:
8971
end:
@@ -102,24 +84,6 @@ result:
10284
character: 4
10385
line: 3
10486
uri: folder_b/duplicated.resource
105-
- !Location
106-
range:
107-
end:
108-
character: 7
109-
line: 3
110-
start:
111-
character: 4
112-
line: 3
113-
uri: folder_b/duplicated.resource
114-
- !Location
115-
range:
116-
end:
117-
character: 7
118-
line: 6
119-
start:
120-
character: 4
121-
line: 6
122-
uri: folder_b/duplicated.resource
12387
- !Location
12488
range:
12589
end:

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,6 @@ result:
6666
character: 4
6767
line: 3
6868
uri: folder_a/duplicated.resource
69-
- !Location
70-
range:
71-
end:
72-
character: 7
73-
line: 3
74-
start:
75-
character: 4
76-
line: 3
77-
uri: folder_a/duplicated.resource
78-
- !Location
79-
range:
80-
end:
81-
character: 7
82-
line: 6
83-
start:
84-
character: 4
85-
line: 6
86-
uri: folder_a/duplicated.resource
8769
- !Location
8870
range:
8971
end:
@@ -102,24 +84,6 @@ result:
10284
character: 4
10385
line: 3
10486
uri: folder_b/duplicated.resource
105-
- !Location
106-
range:
107-
end:
108-
character: 7
109-
line: 3
110-
start:
111-
character: 4
112-
line: 3
113-
uri: folder_b/duplicated.resource
114-
- !Location
115-
range:
116-
end:
117-
character: 7
118-
line: 6
119-
start:
120-
character: 4
121-
line: 6
122-
uri: folder_b/duplicated.resource
12387
- !Location
12488
range:
12589
end:

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,6 @@ result:
6666
character: 4
6767
line: 3
6868
uri: folder_a/duplicated.resource
69-
- !Location
70-
range:
71-
end:
72-
character: 7
73-
line: 3
74-
start:
75-
character: 4
76-
line: 3
77-
uri: folder_a/duplicated.resource
78-
- !Location
79-
range:
80-
end:
81-
character: 7
82-
line: 6
83-
start:
84-
character: 4
85-
line: 6
86-
uri: folder_a/duplicated.resource
8769
- !Location
8870
range:
8971
end:
@@ -102,24 +84,6 @@ result:
10284
character: 4
10385
line: 3
10486
uri: folder_b/duplicated.resource
105-
- !Location
106-
range:
107-
end:
108-
character: 7
109-
line: 3
110-
start:
111-
character: 4
112-
line: 3
113-
uri: folder_b/duplicated.resource
114-
- !Location
115-
range:
116-
end:
117-
character: 7
118-
line: 6
119-
start:
120-
character: 4
121-
line: 6
122-
uri: folder_b/duplicated.resource
12387
- !Location
12488
range:
12589
end:

0 commit comments

Comments
 (0)