Fixed id extraction and visitor virtual methods

elamaunt · Jan 5, 2024 · 79ef2a4 · 79ef2a4
1 parent 3b993a0
commit 79ef2a4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git a/src/GDShrapt.Reader/SimpleTokens/GDIdentifier.cs b/src/GDShrapt.Reader/SimpleTokens/GDIdentifier.cs
@@ -183,6 +183,15 @@ public bool TryExtractLocalScopeVisibleDeclarationFromParents(out GDIdentifier d
 
                 if (node is GDMethodDeclaration method)
                 {
+                    foreach (var item in node.GetMethodScopeDeclarations(startLine))
+                    {
+                        if (item == this)
+                        {
+                            declaration = item;
+                            return true;
+                        }
+                    }
+
                     if (method.Identifier == this)
                     {
                         declaration = method.Identifier;

diff --git a/src/GDShrapt.Reader/Walking/GDVisitor.cs b/src/GDShrapt.Reader/Walking/GDVisitor.cs
@@ -352,92 +352,82 @@ public virtual void LeftListChild(GDNode node)
             // Nothing
         }
 
-        public void Visit(GDClassMemberAttributeDeclaration d)
+        public virtual void Visit(GDClassMemberAttributeDeclaration d)
         {
             // Nothing
         }
 
-        public void Left(GDClassMemberAttributeDeclaration d)
+        public virtual void Left(GDClassMemberAttributeDeclaration d)
         {
             // Nothing
         }
 
-        public void Visit(GDAttribute a)
+        public virtual void Visit(GDAttribute a)
         {
             // Nothing
         }
 
-        public void Left(GDAttribute a)
+        public virtual void Left(GDAttribute a)
         {
             // Nothing
         }
 
-        public void Visit(GDGetAccessorBodyDeclaration d)
+        public virtual void Visit(GDGetAccessorBodyDeclaration d)
         {
             // Nothing
         }
 
-        public void Left(GDGetAccessorBodyDeclaration d)
+        public virtual void Left(GDGetAccessorBodyDeclaration d)
         {
             // Nothing
         }
 
-        public void Visit(GDSetAccessorBodyDeclaration d)
+        public virtual void Visit(GDSetAccessorBodyDeclaration d)
         {
             // Nothing
         }
 
-        public void Left(GDSetAccessorBodyDeclaration d)
+        public virtual void Left(GDSetAccessorBodyDeclaration d)
         {
             // Nothing
         }
 
-        public void Visit(GDSetAccessorMethodDeclaration d)
+        public virtual void Visit(GDSetAccessorMethodDeclaration d)
         {
             // Nothing
         }
 
-        public void Left(GDSetAccessorMethodDeclaration d)
+        public virtual void Left(GDSetAccessorMethodDeclaration d)
         {
             // Nothing
         }
 
-        public void Visit(GDSingleTypeNode t)
+        public virtual void Visit(GDSingleTypeNode t)
         {
             // Nothing
         }
 
-        public void Left(GDSingleTypeNode t)
+        public virtual void Left(GDSingleTypeNode t)
         {
             // Nothing
         }
 
-        public void Visit(GDArrayTypeNode t)
+        public virtual void Visit(GDArrayTypeNode t)
         {
             // Nothing
         }
 
-        public void Left(GDArrayTypeNode t)
+        public virtual void Left(GDArrayTypeNode t)
         {
             // Nothing
         }
 
-        public void Visit(GDGetAccessorMethodDeclaration d)
+        public virtual void Visit(GDGetAccessorMethodDeclaration d)
         {
             // Nothing
         }
 
-        public void Left(GDGetAccessorMethodDeclaration d)
-        {
-            // Nothing
-        }
-
-        public virtual void DidLeft(GDExpression expr)
-        {
-            // Nothing
-        }
-
-        public virtual void WillVisit(GDExpression expr)
+        public virtual void Left(GDGetAccessorMethodDeclaration d)
         {
             // Nothing
         }