Merge pull request #33 from xuhuanzy/dev

CppCXY · web-flow · commit 594ab04eb143 · 2024-07-19T10:22:15.000+08:00
fix `private` and `protected`
diff --git a/EmmyLua/CodeAnalysis/Diagnostics/Checkers/VisibilityChecker.cs b/EmmyLua/CodeAnalysis/Diagnostics/Checkers/VisibilityChecker.cs
@@ -55,7 +55,7 @@ public override void Check(DiagnosticContext context)
             var envElement = FindSourceOrClosure(indexExpr);
             if (declaration.IsPrivate)
             {
-                if (envElement is LuaSourceSyntax || envElement.Parent is not LuaFuncStatSyntax luaFuncStat)
+                if (envElement is LuaSourceSyntax)
                 {
                     context.Report(
                         DiagnosticCode.AccessPrivateMember,
@@ -65,9 +65,8 @@ public override void Check(DiagnosticContext context)
 
                     continue;
                 }
-
                 var parentType = context.SearchContext.Compilation.Db.QueryParentType(declaration.UniqueId);
-                var parentTable = context.SearchContext.Infer(luaFuncStat.IndexExpr?.PrefixExpr);
+                var parentTable = context.SearchContext.Infer(prefixExpr);
                 if (!parentTable.Equals(parentType))
                 {
                     context.Report(
@@ -79,7 +78,7 @@ public override void Check(DiagnosticContext context)
             }
             else if (declaration.IsProtected)
             {
-                if (envElement is LuaSourceSyntax || envElement.Parent is not LuaFuncStatSyntax luaFuncStat)
+                if (envElement is LuaSourceSyntax)
                 {
                     context.Report(
                         DiagnosticCode.AccessProtectedMember,
@@ -91,7 +90,7 @@ public override void Check(DiagnosticContext context)
                 }
 
                 var parentType = context.SearchContext.Compilation.Db.QueryParentType(declaration.UniqueId);
-                var parentTable = context.SearchContext.Infer(luaFuncStat.IndexExpr?.PrefixExpr);
+                var parentTable = context.SearchContext.Infer(prefixExpr);
                 if (!parentTable.SubTypeOf(parentType, context.SearchContext))
                 {
                     context.Report(

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public override void Check(DiagnosticContext context)`
`55`	`55`	`var envElement = FindSourceOrClosure(indexExpr);`
`56`	`56`	`if (declaration.IsPrivate)`
`57`	`57`	`{`
`58`		`- if (envElement is LuaSourceSyntax \|\| envElement.Parent is not LuaFuncStatSyntax luaFuncStat)`
	`58`	`+ if (envElement is LuaSourceSyntax)`
`59`	`59`	`{`
`60`	`60`	`context.Report(`
`61`	`61`	`DiagnosticCode.AccessPrivateMember,`
`@@ -65,9 +65,8 @@ public override void Check(DiagnosticContext context)`
`65`	`65`
`66`	`66`	`continue;`
`67`	`67`	`}`
`68`		`-`
`69`	`68`	`var parentType = context.SearchContext.Compilation.Db.QueryParentType(declaration.UniqueId);`
`70`		`- var parentTable = context.SearchContext.Infer(luaFuncStat.IndexExpr?.PrefixExpr);`
	`69`	`+ var parentTable = context.SearchContext.Infer(prefixExpr);`
`71`	`70`	`if (!parentTable.Equals(parentType))`
`72`	`71`	`{`
`73`	`72`	`context.Report(`
`@@ -79,7 +78,7 @@ public override void Check(DiagnosticContext context)`
`79`	`78`	`}`
`80`	`79`	`else if (declaration.IsProtected)`
`81`	`80`	`{`
`82`		`- if (envElement is LuaSourceSyntax \|\| envElement.Parent is not LuaFuncStatSyntax luaFuncStat)`
	`81`	`+ if (envElement is LuaSourceSyntax)`
`83`	`82`	`{`
`84`	`83`	`context.Report(`
`85`	`84`	`DiagnosticCode.AccessProtectedMember,`
`@@ -91,7 +90,7 @@ public override void Check(DiagnosticContext context)`
`91`	`90`	`}`
`92`	`91`
`93`	`92`	`var parentType = context.SearchContext.Compilation.Db.QueryParentType(declaration.UniqueId);`
`94`		`- var parentTable = context.SearchContext.Infer(luaFuncStat.IndexExpr?.PrefixExpr);`
	`93`	`+ var parentTable = context.SearchContext.Infer(prefixExpr);`
`95`	`94`	`if (!parentTable.SubTypeOf(parentType, context.SearchContext))`
`96`	`95`	`{`
`97`	`96`	`context.Report(`