fix: merge conflicts

Safe-DS · Jan 11, 2024 · f4c4c23 · f4c4c23
1 parent 6843001
commit f4c4c23
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/library_analyzer/processing/api/purity_analysis/_get_module_data.py b/src/library_analyzer/processing/api/purity_analysis/_get_module_data.py
@@ -534,7 +534,7 @@ def get_symbol(self, node: astroid.NodeNG, current_scope: astroid.NodeNG | None)
                 return LocalVariable(node=node, id=calc_node_id(node), name=node.name)
 
             case (
-                astroid.TryExcept() | astroid.TryFinally()
+            astroid.TryExcept() | astroid.TryFinally()
             ):  # TODO: can we summarize Lambda and ListComp here? -> only if nodes in try except are not global
                 return LocalVariable(node=node, id=calc_node_id(node), name=node.name)
 

diff --git a/src/library_analyzer/processing/api/purity_analysis/_resolve_references.py b/src/library_analyzer/processing/api/purity_analysis/_resolve_references.py
@@ -64,7 +64,6 @@ def _find_name_references(
         if isinstance(value_ref.node, astroid.Name | MemberAccessValue):
             value_ref_complete = _find_value_references(value_ref, target_references, classes, functions, parameters)
             if value_ref_complete.node.name in final_references:
-                if value_ref_complete.node.name in final_references:
                 final_references[value_ref_complete.node.name].append(value_ref_complete)
             else:
                 final_references[value_ref_complete.node.name] = [value_ref_complete]