From 349a5deb35b3fa0ed031f23255e0fbf3c8c65788 Mon Sep 17 00:00:00 2001 From: Luis Leal Date: Thu, 23 Jan 2025 10:21:13 +0200 Subject: [PATCH] Convert EventArgsCacheGenerator to C# 7.3 compatible syntax --- ...ed.SourceGenerator.Internal.EventArgsCache.verified.cs | 8 ++++---- .../EventArgsCacheGenerator.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PropertyChanged.SourceGenerator.UnitTests/AlsoNotifyTests.HandlesStandardNonPropertyNames_PropertyChanged.SourceGenerator.Internal.EventArgsCache.verified.cs b/src/PropertyChanged.SourceGenerator.UnitTests/AlsoNotifyTests.HandlesStandardNonPropertyNames_PropertyChanged.SourceGenerator.Internal.EventArgsCache.verified.cs index 771fb96..d3411f5 100644 --- a/src/PropertyChanged.SourceGenerator.UnitTests/AlsoNotifyTests.HandlesStandardNonPropertyNames_PropertyChanged.SourceGenerator.Internal.EventArgsCache.verified.cs +++ b/src/PropertyChanged.SourceGenerator.UnitTests/AlsoNotifyTests.HandlesStandardNonPropertyNames_PropertyChanged.SourceGenerator.Internal.EventArgsCache.verified.cs @@ -3,12 +3,12 @@ internal static class EventArgsCache { private static global::System.ComponentModel.PropertyChangedEventArgs _PropertyChanged_Null; - public static global::System.ComponentModel.PropertyChangedEventArgs PropertyChanged_Null => _PropertyChanged_Null ??= new global::System.ComponentModel.PropertyChangedEventArgs(null); + public static global::System.ComponentModel.PropertyChangedEventArgs PropertyChanged_Null => _PropertyChanged_Null = _PropertyChanged_Null ?? new global::System.ComponentModel.PropertyChangedEventArgs(null); private static global::System.ComponentModel.PropertyChangedEventArgs _PropertyChanged_Empty; - public static global::System.ComponentModel.PropertyChangedEventArgs PropertyChanged_Empty => _PropertyChanged_Empty ??= new global::System.ComponentModel.PropertyChangedEventArgs(@""); + public static global::System.ComponentModel.PropertyChangedEventArgs PropertyChanged_Empty => _PropertyChanged_Empty = _PropertyChanged_Empty ?? new global::System.ComponentModel.PropertyChangedEventArgs(@""); private static global::System.ComponentModel.PropertyChangedEventArgs _PropertyChanged_Foo; - public static global::System.ComponentModel.PropertyChangedEventArgs PropertyChanged_Foo => _PropertyChanged_Foo ??= new global::System.ComponentModel.PropertyChangedEventArgs(@"Foo"); + public static global::System.ComponentModel.PropertyChangedEventArgs PropertyChanged_Foo => _PropertyChanged_Foo = _PropertyChanged_Foo ?? new global::System.ComponentModel.PropertyChangedEventArgs(@"Foo"); private static global::System.ComponentModel.PropertyChangedEventArgs _PropertyChanged_Item; - public static global::System.ComponentModel.PropertyChangedEventArgs PropertyChanged_Item => _PropertyChanged_Item ??= new global::System.ComponentModel.PropertyChangedEventArgs(@"Item[]"); + public static global::System.ComponentModel.PropertyChangedEventArgs PropertyChanged_Item => _PropertyChanged_Item = _PropertyChanged_Item ?? new global::System.ComponentModel.PropertyChangedEventArgs(@"Item[]"); } } \ No newline at end of file diff --git a/src/PropertyChanged.SourceGenerator/EventArgsCacheGenerator.cs b/src/PropertyChanged.SourceGenerator/EventArgsCacheGenerator.cs index 018bcfd..e415d4d 100644 --- a/src/PropertyChanged.SourceGenerator/EventArgsCacheGenerator.cs +++ b/src/PropertyChanged.SourceGenerator/EventArgsCacheGenerator.cs @@ -39,7 +39,7 @@ public void GenerateNameCache() } this.writer.WriteLine($"private static {eventArgsTypeName} {backingFieldName};"); this.writer.WriteLine($"public static {eventArgsTypeName} {cacheName} => " + - $"{backingFieldName} ??= new {eventArgsTypeName}({EscapeString(propertyName)});"); + $"{backingFieldName} = {backingFieldName} ?? new {eventArgsTypeName}({EscapeString(propertyName)});"); } this.writer.Indent--;