From c9aee16e48165248837036219f97f2813fb0de4c Mon Sep 17 00:00:00 2001
From: Christian Banse <oxisto@aybaze.com>
Date: Sat, 21 Oct 2023 20:32:00 +0200
Subject: [PATCH] Merge aliases of scope manager

---
 .../src/main/kotlin/de/fraunhofer/aisec/cpg/ScopeManager.kt    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/ScopeManager.kt b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/ScopeManager.kt
index 49fff98607b..146125e73be 100644
--- a/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/ScopeManager.kt
+++ b/cpg-core/src/main/kotlin/de/fraunhofer/aisec/cpg/ScopeManager.kt
@@ -199,6 +199,9 @@ class ScopeManager : ScopeProvider {
             // scope.
             scopeMap.putAll(manager.scopeMap.filter { it.key != null })
 
+            // Merge aliases
+            aliases.putAll(manager.aliases)
+
             // free the maps, just to clear up some things. this scope manager will not be used
             // anymore
             manager.fqnScopeMap.clear()