Skip to content

Commit e3613d1

Browse files
committed
correct loading resource if they where already imported
1 parent e0bcd58 commit e3613d1

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

robotcode/language_server/robotframework/diagnostics/namespace.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -914,16 +914,6 @@ async def _import(
914914
if value.name is None:
915915
raise NameSpaceError("Resource setting requires value.")
916916

917-
source = await self.imports_manager.find_resource(
918-
value.name,
919-
base_dir,
920-
variables=variables,
921-
)
922-
923-
# already imported
924-
if any(r for r in self._resources.values() if r.library_doc.source == source):
925-
return None, variables
926-
927917
result = await self._get_resource_entry(value.name, base_dir, sentinel=value, variables=variables)
928918
result.import_range = value.range()
929919
result.import_source = value.source
@@ -1086,7 +1076,7 @@ async def _import(
10861076
already_imported_resources is not None
10871077
and already_imported_resources.library_doc.source
10881078
):
1089-
self._resources[entry.import_name] = entry
1079+
# self._resources[entry.import_name] = entry
10901080

10911081
await self.append_diagnostics(
10921082
range=entry.import_range,
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
*** Settings ***
2+
3+
Resource ../resources/folder_a/duplicated.resource
4+
Resource ../resources/folder_b/duplicated.resource
5+
Resource folder_b/duplicated.resource
6+
7+
*** Test Cases ***
8+
first
9+
a resource keyword A
10+
# ^^^^^^^^^^^^^^^^^^^^ duplicated keyword
11+
a resource keyword B
12+
# ^^^^^^^^^^^^^^^^^^^^ duplicated keyword
13+
duplicated keyword
14+
# ^^^^^^^^^^^^^^^^^^^^ duplicated keyword
15+
duplicated.a resource keyword A
16+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ duplicated keyword
17+
duplicated.a resource keyword B
18+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ duplicated keyword
19+
duplicated.duplicated keyword
20+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ duplicated keyword

0 commit comments

Comments
 (0)