Skip to content

Commit ce787b2

Browse files
committed
fix(analyzer): fixed find variables as modules for RF > 5
1 parent 0851d4f commit ce787b2

File tree

1 file changed

+28
-48
lines changed

1 file changed

+28
-48
lines changed

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

Lines changed: 28 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,25 +1021,13 @@ def _find_library(
10211021
base_dir: str,
10221022
variables: Optional[Dict[str, Any]] = None,
10231023
) -> str:
1024-
1025-
if contains_variable(name, "$@&%"):
1026-
return find_library(
1027-
name,
1028-
str(self.root_folder),
1029-
base_dir,
1030-
self.get_resolvable_command_line_variables(),
1031-
variables,
1032-
)
1033-
1034-
if name in STDLIBS:
1035-
result = ROBOT_LIBRARY_PACKAGE + "." + name
1036-
else:
1037-
result = name
1038-
1039-
if is_library_by_path(result):
1040-
return find_file_ex(result, base_dir, "Library")
1041-
1042-
return result
1024+
return find_library(
1025+
name,
1026+
str(self.root_folder),
1027+
base_dir,
1028+
self.get_resolvable_command_line_variables(),
1029+
variables,
1030+
)
10431031

10441032
def _find_library_simple(
10451033
self,
@@ -1077,17 +1065,14 @@ def __find_resource(
10771065
file_type: str = "Resource",
10781066
variables: Optional[Dict[str, Any]] = None,
10791067
) -> str:
1080-
if contains_variable(name, "$@&%"):
1081-
return find_file(
1082-
name,
1083-
str(self.root_folder),
1084-
base_dir,
1085-
self.get_resolvable_command_line_variables(),
1086-
variables,
1087-
file_type,
1088-
)
1089-
1090-
return find_file_ex(name, base_dir, file_type)
1068+
return find_file(
1069+
name,
1070+
str(self.root_folder),
1071+
base_dir,
1072+
self.get_resolvable_command_line_variables(),
1073+
variables,
1074+
file_type,
1075+
)
10911076

10921077
def __find_resource_simple(
10931078
self,
@@ -1111,7 +1096,6 @@ def find_variables(
11111096
name,
11121097
base_dir,
11131098
variables,
1114-
resolve_variables,
11151099
resolve_command_line_vars,
11161100
)
11171101
return self._variables_files_cache.get(self.__find_variables_simple, name, base_dir)
@@ -1122,25 +1106,15 @@ def __find_variables(
11221106
name: str,
11231107
base_dir: str,
11241108
variables: Optional[Dict[str, Any]] = None,
1125-
resolve_variables: bool = True,
11261109
resolve_command_line_vars: bool = True,
11271110
) -> str:
1128-
if resolve_variables and contains_variable(name, "$@&%"):
1129-
return find_variables(
1130-
name,
1131-
str(self.root_folder),
1132-
base_dir,
1133-
self.get_resolvable_command_line_variables() if resolve_command_line_vars else None,
1134-
variables,
1135-
)
1136-
1137-
if get_robot_version() >= (5, 0):
1138-
if is_variables_by_path(name):
1139-
return find_file_ex(name, base_dir, "Variables")
1140-
1141-
return name
1142-
1143-
return find_file_ex(name, base_dir, "Variables")
1111+
return find_variables(
1112+
name,
1113+
str(self.root_folder),
1114+
base_dir,
1115+
self.get_resolvable_command_line_variables() if resolve_command_line_vars else None,
1116+
variables,
1117+
)
11441118

11451119
@_logger.call
11461120
def __find_variables_simple(
@@ -1149,6 +1123,12 @@ def __find_variables_simple(
11491123
base_dir: str,
11501124
) -> str:
11511125

1126+
if get_robot_version() >= (5, 0):
1127+
if is_variables_by_path(name):
1128+
return find_file_ex(name, base_dir, "Variables")
1129+
1130+
return name
1131+
11521132
return find_file_ex(name, base_dir, "Variables")
11531133

11541134
@property

0 commit comments

Comments
 (0)