FIX bugs

CppCXY · May 28, 2024 · 9a17bbe · 9a17bbe
1 parent c674035
commit 9a17bbe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/EmmyLua/CodeAnalysis/Compilation/Analyzer/ResolveAnalyzer/ResolveAnalyzer.cs b/EmmyLua/CodeAnalysis/Compilation/Analyzer/ResolveAnalyzer/ResolveAnalyzer.cs
@@ -150,6 +150,7 @@ private void ResolveIndex(UnResolved unResolved)
                 if (ty is LuaNamedType namedType)
                 {
                     Compilation.Db.AddMember(documentId, namedType.Name, declaration);
+                    Context.ClearMemberCache(namedType.Name);
                 }
             }
         }

diff --git a/EmmyLua/CodeAnalysis/Compilation/Infer/SearchContext.cs b/EmmyLua/CodeAnalysis/Compilation/Infer/SearchContext.cs
@@ -67,6 +67,12 @@ public void ClearCache()
         DeclarationCaches.Clear();
     }
 
+    public void ClearMemberCache(string name)
+    {
+        NamedTypeMemberCaches.Remove(name);
+        BaseMemberCaches.Remove(name);
+    }
+
     private LuaType InferCore(LuaSyntaxElement element)
     {
         if (_currentDepth > MaxDepth)

diff --git a/EmmyLua/CodeAnalysis/Compile/Grammar/Lua/Expression.cs b/EmmyLua/CodeAnalysis/Compile/Grammar/Lua/Expression.cs
@@ -150,7 +150,11 @@ public static CompleteMarker ClosureExpr(LuaParser p)
 
             if (ParamList(p).IsComplete)
             {
-                BlockParser.Block(p);
+                if (p.Current is not LuaTokenKind.TkEnd)
+                {
+                    BlockParser.Block(p);
+                }
+
                 p.Expect(LuaTokenKind.TkEnd);
             }