fix scoping

Author: max-leuthaeuser

joern-cli/frontends/swiftsrc2cpg/src/main/scala/io/joern/swiftsrc2cpg/astcreation/AstForDeclSyntaxCreator.scala

@@ -349,11 +349,6 @@ trait AstForDeclSyntaxCreator(implicit withSchemaValidation: ValidationMode) {
     // adding all static members and retrieving their initialization calls
     val staticMemberInits = allClassMembers.filter(isStaticMember)
 
-    methodAstParentStack.pop()
-    typeRefIdStack.pop()
-    scope.popScope()
-    scope.popScope()
-
     if (staticMemberInits.nonEmpty) {
       val init = staticInitMethodAstAndBlock(
         node,
@@ -367,6 +362,11 @@ trait AstForDeclSyntaxCreator(implicit withSchemaValidation: ValidationMode) {
       diffGraph.addEdge(typeDeclNode_, init.method, EdgeTypes.AST)
     }
 
+    methodAstParentStack.pop()
+    typeRefIdStack.pop()
+    scope.popScope()
+    scope.popScope()
+
     Ast(typeDeclNode_)
   }
 
@@ -490,11 +490,6 @@ trait AstForDeclSyntaxCreator(implicit withSchemaValidation: ValidationMode) {
     // adding all static members and retrieving their initialization calls
     val staticMemberInits = allClassMembers.filter(isStaticMember)
 
-    methodAstParentStack.pop()
-    typeRefIdStack.pop()
-    scope.popScope()
-    scope.popScope()
-
     if (staticMemberInits.nonEmpty) {
       val init = staticInitMethodAstAndBlock(
         node,
@@ -508,6 +503,11 @@ trait AstForDeclSyntaxCreator(implicit withSchemaValidation: ValidationMode) {
       diffGraph.addEdge(typeDeclNode_, init.method, EdgeTypes.AST)
     }
 
+    methodAstParentStack.pop()
+    typeRefIdStack.pop()
+    scope.popScope()
+    scope.popScope()
+
     Ast(typeDeclNode_)
   }