Annotate test code.

JohanLarsson · JohanLarsson · commit 2c7cd5d29bf7 · 2021-12-10T07:39:06.000+01:00
diff --git a/PropertyChangedAnalyzers.Test/INPC001ImplementINotifyPropertyChanged/CodeFix.cs b/PropertyChangedAnalyzers.Test/INPC001ImplementINotifyPropertyChanged/CodeFix.cs
@@ -28,13 +28,13 @@ namespace N
 {
     public class C : System.ComponentModel.INotifyPropertyChanged
     {
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+        public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
 
         public int P1 { get; set; }
 
         public int P2 { get; set; }
 
-        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
         }
@@ -62,11 +62,11 @@ namespace N
 {
     public class C : System.ComponentModel.INotifyPropertyChanged
     {
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+        public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
 
         public int P { get; set; }
 
-        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
         }
@@ -94,11 +94,11 @@ namespace N
 {
     internal class C : System.ComponentModel.INotifyPropertyChanged
     {
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+        public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
 
         internal int P { get; set; }
 
-        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
         }
@@ -139,7 +139,7 @@ public class C : System.ComponentModel.INotifyPropertyChanged
     {
         private int p;
 
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+        public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
 
         public int P
         {
@@ -153,7 +153,7 @@ private set
             }
         }
 
-        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
         }
@@ -188,15 +188,15 @@ public class C : System.ComponentModel.INotifyPropertyChanged
     {
         private int p;
 
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+        public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
 
         public int P
         {
             get => this.p;
             private set => this.p = value;
         }
 
-        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
         }
@@ -237,7 +237,7 @@ public class C : System.ComponentModel.INotifyPropertyChanged
     {
         private int _p;
 
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+        public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
 
         public int P
         {
@@ -251,7 +251,7 @@ private set
             }
         }
 
-        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
         {
             PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
         }
@@ -338,9 +338,9 @@ namespace N
 
     public class ↓C
     {
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
@@ -355,9 +355,9 @@ namespace N
 
     public class C : INotifyPropertyChanged
     {
-        public event PropertyChangedEventHandler PropertyChanged;
+        public event PropertyChangedEventHandler? PropertyChanged;
 
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
@@ -383,9 +383,11 @@ public C()
             E += (_, __) => this.P = 1;
         }
 
-        public event EventHandler E;
+        public event EventHandler? E;
 
         public int P { get; private set; }
+
+        private void M() => this.E?.Invoke(this, EventArgs.Empty);
     }
 }".AssertReplace("this.P = 1", assignCode);
 
@@ -401,15 +403,17 @@ public C()
             E += (_, __) => this.P = 1;
         }
 
-        public event EventHandler E;
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+        public event EventHandler? E;
+        public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
 
         public int P { get; private set; }
 
-        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)
+        protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
         {
             this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
         }
+
+        private void M() => this.E?.Invoke(this, EventArgs.Empty);
     }
 }".AssertReplace("this.P = 1", assignCode);
 
diff --git a/PropertyChangedAnalyzers.Test/TestHelpers/Code.cs b/PropertyChangedAnalyzers.Test/TestHelpers/Code.cs
@@ -9,9 +9,11 @@ public static class Code
 namespace N
 {
     using System;
+
     class UnqualifiedUnderscoreFields
     {
         private readonly int _f;
+
         UnqualifiedUnderscoreFields()
         {
             _f = 1;
@@ -20,7 +22,7 @@ class UnqualifiedUnderscoreFields
             M();
         }
 
-        public event Action E;
+        public event Action? E;
 
         public int P { get; }
 
@@ -35,9 +37,11 @@ class UnqualifiedUnderscoreFields
 namespace N
 {
     using System;
+
     class QualifiedUnderscoreFields
     {
         private readonly int _f;
+
         QualifiedUnderscoreFields()
         {
             this._f = 1;
@@ -46,7 +50,7 @@ class QualifiedUnderscoreFields
             M();
         }
 
-        public event Action E;
+        public event Action? E;
 
         public int P { get; }
 
@@ -61,9 +65,11 @@ class QualifiedUnderscoreFields
 namespace N
 {
     using System;
+
     class UnqualifiedUnprefixedFields
     {
         private readonly int f;
+
         UnqualifiedUnprefixedFields()
         {
             f = 1;
@@ -72,7 +78,7 @@ class UnqualifiedUnprefixedFields
             M();
         }
 
-        public event Action E;
+        public event Action? E;
 
         public int P { get; }
 
@@ -87,9 +93,11 @@ class UnqualifiedUnprefixedFields
 namespace N
 {
     using System;
+
     class QualifiedUnprefixedFields
     {
         private readonly int f;
+
         QualifiedUnprefixedFields()
         {
             this.f = 1;
@@ -98,7 +106,7 @@ class QualifiedUnprefixedFields
             M();
         }
 
-        public event Action E;
+        public event Action? E;
 
         public int P { get; }
 

Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,13 @@ namespace N`
`28`	`28`	`{`
`29`	`29`	`public class C : System.ComponentModel.INotifyPropertyChanged`
`30`	`30`	`{`
`31`		`- public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;`
	`31`	`+ public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;`
`32`	`32`
`33`	`33`	`public int P1 { get; set; }`
`34`	`34`
`35`	`35`	`public int P2 { get; set; }`
`36`	`36`
`37`		`- protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)`
	`37`	`+ protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`38`	`38`	`{`
`39`	`39`	`this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));`
`40`	`40`	`}`
`@@ -62,11 +62,11 @@ namespace N`
`62`	`62`	`{`
`63`	`63`	`public class C : System.ComponentModel.INotifyPropertyChanged`
`64`	`64`	`{`
`65`		`- public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;`
	`65`	`+ public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;`
`66`	`66`
`67`	`67`	`public int P { get; set; }`
`68`	`68`
`69`		`- protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)`
	`69`	`+ protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`70`	`70`	`{`
`71`	`71`	`this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));`
`72`	`72`	`}`
`@@ -94,11 +94,11 @@ namespace N`
`94`	`94`	`{`
`95`	`95`	`internal class C : System.ComponentModel.INotifyPropertyChanged`
`96`	`96`	`{`
`97`		`- public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;`
	`97`	`+ public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;`
`98`	`98`
`99`	`99`	`internal int P { get; set; }`
`100`	`100`
`101`		`- protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)`
	`101`	`+ protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`102`	`102`	`{`
`103`	`103`	`this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));`
`104`	`104`	`}`
`@@ -139,7 +139,7 @@ public class C : System.ComponentModel.INotifyPropertyChanged`
`139`	`139`	`{`
`140`	`140`	`private int p;`
`141`	`141`
`142`		`- public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;`
	`142`	`+ public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;`
`143`	`143`
`144`	`144`	`public int P`
`145`	`145`	`{`
`@@ -153,7 +153,7 @@ private set`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`156`		`- protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)`
	`156`	`+ protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`157`	`157`	`{`
`158`	`158`	`this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));`
`159`	`159`	`}`
`@@ -188,15 +188,15 @@ public class C : System.ComponentModel.INotifyPropertyChanged`
`188`	`188`	`{`
`189`	`189`	`private int p;`
`190`	`190`
`191`		`- public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;`
	`191`	`+ public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;`
`192`	`192`
`193`	`193`	`public int P`
`194`	`194`	`{`
`195`	`195`	`get => this.p;`
`196`	`196`	`private set => this.p = value;`
`197`	`197`	`}`
`198`	`198`
`199`		`- protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)`
	`199`	`+ protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`200`	`200`	`{`
`201`	`201`	`this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));`
`202`	`202`	`}`
`@@ -237,7 +237,7 @@ public class C : System.ComponentModel.INotifyPropertyChanged`
`237`	`237`	`{`
`238`	`238`	`private int _p;`
`239`	`239`
`240`		`- public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;`
	`240`	`+ public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;`
`241`	`241`
`242`	`242`	`public int P`
`243`	`243`	`{`
`@@ -251,7 +251,7 @@ private set`
`251`	`251`	`}`
`252`	`252`	`}`
`253`	`253`
`254`		`- protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)`
	`254`	`+ protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`255`	`255`	`{`
`256`	`256`	`PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));`
`257`	`257`	`}`
`@@ -338,9 +338,9 @@ namespace N`
`338`	`338`
`339`	`339`	`public class ↓C`
`340`	`340`	`{`
`341`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`341`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`342`	`342`
`343`		`- protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
	`343`	`+ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)`
`344`	`344`	`{`
`345`	`345`	`this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`346`	`346`	`}`
`@@ -355,9 +355,9 @@ namespace N`
`355`	`355`
`356`	`356`	`public class C : INotifyPropertyChanged`
`357`	`357`	`{`
`358`		`- public event PropertyChangedEventHandler PropertyChanged;`
	`358`	`+ public event PropertyChangedEventHandler? PropertyChanged;`
`359`	`359`
`360`		`- protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`
	`360`	`+ protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)`
`361`	`361`	`{`
`362`	`362`	`this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));`
`363`	`363`	`}`
`@@ -383,9 +383,11 @@ public C()`
`383`	`383`	`E += (_, __) => this.P = 1;`
`384`	`384`	`}`
`385`	`385`
`386`		`- public event EventHandler E;`
	`386`	`+ public event EventHandler? E;`
`387`	`387`
`388`	`388`	`public int P { get; private set; }`
	`389`	`+`
	`390`	`+ private void M() => this.E?.Invoke(this, EventArgs.Empty);`
`389`	`391`	`}`
`390`	`392`	`}".AssertReplace("this.P = 1", assignCode);`
`391`	`393`
`@@ -401,15 +403,17 @@ public C()`
`401`	`403`	`E += (_, __) => this.P = 1;`
`402`	`404`	`}`
`403`	`405`
`404`		`- public event EventHandler E;`
`405`		`- public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;`
	`406`	`+ public event EventHandler? E;`
	`407`	`+ public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;`
`406`	`408`
`407`	`409`	`public int P { get; private set; }`
`408`	`410`
`409`		`- protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)`
	`411`	`+ protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`410`	`412`	`{`
`411`	`413`	`this.PropertyChanged?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));`
`412`	`414`	`}`
	`415`	`+`
	`416`	`+ private void M() => this.E?.Invoke(this, EventArgs.Empty);`
`413`	`417`	`}`
`414`	`418`	`}".AssertReplace("this.P = 1", assignCode);`
`415`	`419`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,11 @@ public static class Code`
`9`	`9`	`namespace N`
`10`	`10`	`{`
`11`	`11`	`using System;`
	`12`	`+`
`12`	`13`	`class UnqualifiedUnderscoreFields`
`13`	`14`	`{`
`14`	`15`	`private readonly int _f;`
	`16`	`+`
`15`	`17`	`UnqualifiedUnderscoreFields()`
`16`	`18`	`{`
`17`	`19`	`_f = 1;`
`@@ -20,7 +22,7 @@ class UnqualifiedUnderscoreFields`
`20`	`22`	`M();`
`21`	`23`	`}`
`22`	`24`
`23`		`- public event Action E;`
	`25`	`+ public event Action? E;`
`24`	`26`
`25`	`27`	`public int P { get; }`
`26`	`28`
`@@ -35,9 +37,11 @@ class UnqualifiedUnderscoreFields`
`35`	`37`	`namespace N`
`36`	`38`	`{`
`37`	`39`	`using System;`
	`40`	`+`
`38`	`41`	`class QualifiedUnderscoreFields`
`39`	`42`	`{`
`40`	`43`	`private readonly int _f;`
	`44`	`+`
`41`	`45`	`QualifiedUnderscoreFields()`
`42`	`46`	`{`
`43`	`47`	`this._f = 1;`
`@@ -46,7 +50,7 @@ class QualifiedUnderscoreFields`
`46`	`50`	`M();`
`47`	`51`	`}`
`48`	`52`
`49`		`- public event Action E;`
	`53`	`+ public event Action? E;`
`50`	`54`
`51`	`55`	`public int P { get; }`
`52`	`56`
`@@ -61,9 +65,11 @@ class QualifiedUnderscoreFields`
`61`	`65`	`namespace N`
`62`	`66`	`{`
`63`	`67`	`using System;`
	`68`	`+`
`64`	`69`	`class UnqualifiedUnprefixedFields`
`65`	`70`	`{`
`66`	`71`	`private readonly int f;`
	`72`	`+`
`67`	`73`	`UnqualifiedUnprefixedFields()`
`68`	`74`	`{`
`69`	`75`	`f = 1;`
`@@ -72,7 +78,7 @@ class UnqualifiedUnprefixedFields`
`72`	`78`	`M();`
`73`	`79`	`}`
`74`	`80`
`75`		`- public event Action E;`
	`81`	`+ public event Action? E;`
`76`	`82`
`77`	`83`	`public int P { get; }`
`78`	`84`
`@@ -87,9 +93,11 @@ class UnqualifiedUnprefixedFields`
`87`	`93`	`namespace N`
`88`	`94`	`{`
`89`	`95`	`using System;`
	`96`	`+`
`90`	`97`	`class QualifiedUnprefixedFields`
`91`	`98`	`{`
`92`	`99`	`private readonly int f;`
	`100`	`+`
`93`	`101`	`QualifiedUnprefixedFields()`
`94`	`102`	`{`
`95`	`103`	`this.f = 1;`
`@@ -98,7 +106,7 @@ class QualifiedUnprefixedFields`
`98`	`106`	`M();`
`99`	`107`	`}`
`100`	`108`
`101`		`- public event Action E;`
	`109`	`+ public event Action? E;`
`102`	`110`
`103`	`111`	`public int P { get; }`
`104`	`112`