Skip to content

Commit b197ebe

Browse files
committed
FIX some bug
1 parent 668ef22 commit b197ebe

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

EmmyLua/CodeAnalysis/Common/IDeclaration.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@ public interface IDeclaration
3535
public IDeclaration Instantiate(Dictionary<string, LuaType> typeDict);
3636

3737
public LuaDocumentId DocumentId { get; }
38+
3839
}

EmmyLua/CodeAnalysis/Compilation/Analyzer/DeclarationAnalyzer/DeclarationBuilder.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,7 @@ private void AnalyzeAssignStatDeclaration(LuaAssignStatSyntax luaAssignStat)
618618
declaration.Info = info with
619619
{
620620
DeclarationType = definedType,
621+
TypeDecl = true
621622
};
622623
unResolveDeclaration.IsTypeDeclaration = true;
623624
}

EmmyLua/CodeAnalysis/Compilation/Declaration/LuaDeclaration.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ public record LocalInfo(
171171

172172
public record GlobalInfo(
173173
LuaElementPtr<LuaNameExprSyntax> VarNamePtr,
174-
LuaType? DeclarationType
174+
LuaType? DeclarationType,
175+
bool TypeDecl = false
175176
) : DeclarationInfo(VarNamePtr.UpCast(), DeclarationType)
176177
{
177178
public LuaElementPtr<LuaNameExprSyntax> VarNamePtr => Ptr.Cast<LuaNameExprSyntax>();

EmmyLua/CodeAnalysis/Compilation/Search/Declarations.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,11 @@ public bool IsUpValue(LuaNameExprSyntax nameExpr, LuaDeclaration declaration)
169169
return false;
170170
}
171171

172+
if (declaration.DocumentId != nameExpr.DocumentId)
173+
{
174+
return false;
175+
}
176+
172177
var closure = nameExpr.Ancestors.OfType<LuaClosureExprSyntax>().FirstOrDefault();
173178
if (closure is not null)
174179
{

0 commit comments

Comments
 (0)