Small fixed

elamaunt · May 17, 2024 · d4cefbd · d4cefbd
1 parent cab9f25
commit d4cefbd
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/src/GDShrapt.Reader/Expressions/GDMethodExpression.cs b/src/GDShrapt.Reader/Expressions/GDMethodExpression.cs
@@ -1,4 +1,7 @@
-namespace GDShrapt.Reader
+using System.Collections.Generic;
+using System.Linq;
+
+namespace GDShrapt.Reader
 {
     public class GDMethodExpression : GDExpression,
          ITokenOrSkipReceiver<GDFuncKeyword>,
@@ -194,7 +197,10 @@ internal override void Left(IGDVisitor visitor)
         {
             visitor.Left(this);
         }
-
+        public override IEnumerable<GDIdentifier> GetMethodScopeDeclarations(int? beforeLine = null)
+        {
+            return Parameters.Select(x => x.Identifier).Where(x => x != null);
+        }
         void ITokenReceiver<GDFuncKeyword>.HandleReceivedToken(GDFuncKeyword token)
         {
             if (_form.IsOrLowerState(State.Func))

diff --git a/src/GDShrapt.Reader/SimpleTokens/GDIdentifier.cs b/src/GDShrapt.Reader/SimpleTokens/GDIdentifier.cs
@@ -204,6 +204,27 @@ public bool TryExtractLocalScopeVisibleDeclarationFromParents(out GDIdentifier d
                     continue;
                 }
 
+                if (node is GDMethodExpression methodExpr)
+                {
+                    foreach (var item in node.GetMethodScopeDeclarations(startLine))
+                    {
+                        if (item == this)
+                        {
+                            declaration = item;
+                            return true;
+                        }
+                    }
+
+                    if (methodExpr.Identifier == this)
+                    {
+                        declaration = methodExpr.Identifier;
+                        return true;
+                    }
+
+                    node = node.Parent;
+                    continue;
+                }
+
                 foreach (var item in node.GetMethodScopeDeclarations(startLine))
                 {
                     if (item == this)