Merge pull request #87 from VeyronSakai/fix/inject-attribute

Fix Extensions.IsInjectAttribute() logic
VeyronSakai · Apr 17, 2024 · 2d70dfd · 2d70dfd
2 parents 6ae6a81 + eaa5495
commit 2d70dfd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/VContainerAnalyzer.Unity/Assets/Plugins/VContainerAnalyzer/VContainerAnalyzer.dll b/VContainerAnalyzer.Unity/Assets/Plugins/VContainerAnalyzer/VContainerAnalyzer.dll
diff --git a/VContainerAnalyzer/Analyzers/FieldAnalyzer.cs b/VContainerAnalyzer/Analyzers/FieldAnalyzer.cs
@@ -28,7 +28,7 @@ private static void Analyze(SymbolAnalysisContext context)
             return;
         }
 
-        var attribute = fieldSymbol.GetAttributes().FirstOrDefault(x => x.AttributeClass.IsInjectAttribute());
+        var attribute = fieldSymbol.GetAttributes().FirstOrDefault(x => x.AttributeClass.IsVContainerInjectAttribute());
         if (attribute == null)
         {
             return;

diff --git a/VContainerAnalyzer/Analyzers/PropertyAnalyzer.cs b/VContainerAnalyzer/Analyzers/PropertyAnalyzer.cs
@@ -29,7 +29,7 @@ private static void Analyze(SymbolAnalysisContext context)
         }
 
         var attribute = propertySymbol.GetAttributes()
-            .FirstOrDefault(x => x.AttributeClass.IsInjectAttribute());
+            .FirstOrDefault(x => x.AttributeClass.IsVContainerInjectAttribute());
         if (attribute == null)
         {
             return;

diff --git a/VContainerAnalyzer/Extensions.cs b/VContainerAnalyzer/Extensions.cs
@@ -21,14 +21,26 @@ internal static bool IsPreserveAttribute(this ITypeSymbol attributeClass)
         return baseType != null && IsPreserveAttribute(baseType);
     }
 
-    internal static bool IsInjectAttribute(this ITypeSymbol attributeClass)
+    internal static bool IsVContainerInjectAttribute(this ITypeSymbol attributeClass)
     {
+        var containingNamespace = attributeClass.ContainingNamespace;
+        if (containingNamespace is not { Name: "VContainer" })
+        {
+            return false;
+        }
+
+        containingNamespace = containingNamespace.ContainingNamespace;
+        if (containingNamespace is not { Name: "" })
+        {
+            return false;
+        }
+
         if (attributeClass.Name == InjectAttributeName)
         {
             return true;
         }
 
         var baseType = attributeClass.BaseType;
-        return baseType != null && IsInjectAttribute(baseType);
+        return baseType != null && IsVContainerInjectAttribute(baseType);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ private static void Analyze(SymbolAnalysisContext context) @@
                 return;
             }
-            var attribute = fieldSymbol.GetAttributes().FirstOrDefault(x => x.AttributeClass.IsInjectAttribute());
+            var attribute = fieldSymbol.GetAttributes().FirstOrDefault(x => x.AttributeClass.IsVContainerInjectAttribute());
             if (attribute == null)
             {
                 return;
@@ Expand Down @@