Merge pull request #884 from ltrzesniewski/fix-883

Fody · Sep 8, 2022 · 7aa911d · 7aa911d
2 parents ba948d0 + 904e5ae
commit 7aa911d
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/...neratorTest.CodeIsGeneratedForPartialClassWithAttributeInFileScopedNamespace.verified.txt b/...neratorTest.CodeIsGeneratedForPartialClassWithAttributeInFileScopedNamespace.verified.txt
@@ -0,0 +1,25 @@
+// PropertyChanged.g.cs
+// <auto-generated/>
+#nullable enable
+#pragma warning disable CS0067
+#pragma warning disable CS8019
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Whatever
+{
+    partial class Class1 : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs(propertyName));
+        }
+
+        protected virtual void OnPropertyChanged(PropertyChangedEventArgs eventArgs)
+        {
+            PropertyChanged?.Invoke(this, eventArgs);
+        }
+    }
+}
diff --git a/PropertyChanged.Fody.Analyzer.Tests/CodeGeneratorTest.cs b/PropertyChanged.Fody.Analyzer.Tests/CodeGeneratorTest.cs
@@ -223,6 +223,27 @@ public async Task CodeIsGeneratedForPartialClassWithAttribute()
         const string source = @"
 using PropertyChanged;
 
+[AddINotifyPropertyChangedInterface]
+public partial class Class1
+{
+    public int Property1 { get; set; }
+    public int Property2 { get; set; }
+}
+";
+        var generated = await RunGenerator(source);
+
+        await VerifyCompilation(source, generated);
+        await Verify(JoinResults(generated));
+    }
+
+    [Fact]
+    public async Task CodeIsGeneratedForPartialClassWithAttributeInFileScopedNamespace()
+    {
+        const string source = @"
+using PropertyChanged;
+
+namespace Whatever;
+
 [AddINotifyPropertyChangedInterface]
 public partial class Class1
 {

diff --git a/PropertyChanged.Fody.Analyzer/ExtensionMethods.cs b/PropertyChanged.Fody.Analyzer/ExtensionMethods.cs
@@ -47,11 +47,11 @@ public static bool HasNoPropertyChangedEvent(this ClassDeclarationSyntax classDe
         return classDeclaration.Members.OfType<EventFieldDeclarationSyntax>().SelectMany(member => member.Declaration.Variables).All(variable => variable.Identifier.Text != "PropertyChanged");
     }
 
-    public static bool AreAllContainingTypesPartialClasses(this ClassDeclarationSyntax classDeclaration)
+    public static bool AreAllContainingTypesPartialClasses(this ClassDeclarationSyntax? classDeclaration)
     {
         while (classDeclaration?.Parent is { } parent)
         {
-            if (parent.IsKind(SyntaxKind.NamespaceDeclaration) || parent.IsKind(SyntaxKind.CompilationUnit))
+            if ((SyntaxKind)parent.RawKind is SyntaxKind.NamespaceDeclaration or SyntaxKind.FileScopedNamespaceDeclaration or SyntaxKind.CompilationUnit)
                 return true;
 
             if (parent is not ClassDeclarationSyntax parentClass || !parentClass.Modifiers.Any(SyntaxKind.PartialKeyword))