Bugfix - Nullable reference type

rrmanzano · Dec 7, 2022 · d620fdb · d620fdb
1 parent 3ac5cfd
commit d620fdb
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/src/Maui.BindableProperty.Generator/Core/BindableProperty/AutoBindablePropertyGenerator.cs b/src/Maui.BindableProperty.Generator/Core/BindableProperty/AutoBindablePropertyGenerator.cs
@@ -101,7 +101,7 @@ private void ProcessBindableProperty(CodeWriter w, IFieldSymbol fieldSymbol, ISy
             var applyHidesUnderlying = fieldSymbol.GetValue<bool>(attributeSymbol, AutoBindableConstants.AttrHidesUnderlyingProperty);
             var hidesUnderlying = applyHidesUnderlying ? " new" : string.Empty;
             var declaringType = fieldType.WithNullableAnnotation(NullableAnnotation.None);
-            var parameters = $"nameof({propertyName}),typeof({declaringType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}),typeof({classSymbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat)}){customParameters}".Split(',');
+            var parameters = $"nameof({propertyName}),typeof({declaringType.ToDisplayString(CommonSymbolDisplayFormat.DefaultFormat)}),typeof({classSymbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat)}){customParameters}".Split(',');
 
             w._(AttributeBuilder.GetAttrGeneratedCodeString());
             w._($@"public static{hidesUnderlying} readonly {AutoBindableConstants.FullNameMauiControls}.BindableProperty {bindablePropertyName} =");
@@ -116,9 +116,9 @@ private void ProcessBindableProperty(CodeWriter w, IFieldSymbol fieldSymbol, ISy
 
             w._();
             AttributeBuilder.WriteAllAttrGeneratedCodeStrings(w);
-            using (w.B(@$"public{hidesUnderlying} {fieldType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)} {propertyName}"))
+            using (w.B(@$"public{hidesUnderlying} {fieldType.ToDisplayString(CommonSymbolDisplayFormat.DefaultFormat)} {propertyName}"))
             {
-                w._($@"get => ({fieldType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)})GetValue({bindablePropertyName});");
+                w._($@"get => ({fieldType.ToDisplayString(CommonSymbolDisplayFormat.DefaultFormat)})GetValue({bindablePropertyName});");
                 if (this.ExistsBodySetter())
                 {
                     using (w.B(@$"set"))

diff --git a/src/Maui.BindableProperty.Generator/Core/BindableProperty/Implementation/DefaultValue.cs b/src/Maui.BindableProperty.Generator/Core/BindableProperty/Implementation/DefaultValue.cs
@@ -43,7 +43,7 @@ public string ProcessBindableParameters()
                 return default;
             });
 
-            return defaultValue != null ? $"defaultValue: {defaultValue}" : $"defaultValue: default({fieldType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)})";
+            return defaultValue != null ? $"defaultValue: {defaultValue}" : $"defaultValue: default({fieldType.ToDisplayString(CommonSymbolDisplayFormat.DefaultFormat)})";
         }
 
         public void ProcessBodySetter(CodeWriter w)

diff --git a/src/Maui.BindableProperty.Generator/Core/BindableProperty/Implementation/PropertyChanged.cs b/src/Maui.BindableProperty.Generator/Core/BindableProperty/Implementation/PropertyChanged.cs
@@ -48,7 +48,7 @@ public void ProcessImplementationLogic(CodeWriter w)
                     var methods = this.GetMethodsToCall(methodName);
                     if (methods.Any())
                     {
-                        w._($@"var ctrl = ({this.ClassSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)})bindable;");
+                        w._($@"var ctrl = ({this.ClassSymbol.ToDisplayString(CommonSymbolDisplayFormat.DefaultFormat)})bindable;");
                         methods.ToList().ForEach(m => {
                             var count = m.Parameters.Count();
                             if (count == 0)

diff --git a/src/Maui.BindableProperty.Generator/Core/BindableProperty/Implementation/ValidateValue.cs b/src/Maui.BindableProperty.Generator/Core/BindableProperty/Implementation/ValidateValue.cs
@@ -59,7 +59,7 @@ public void ProcessImplementationLogic(CodeWriter w)
                 AttributeBuilder.WriteAllAttrGeneratedCodeStrings(w);
                 using (w.B(methodDefinition))
                 {
-                    w._($@"var ctrl = ({this.ClassSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)})bindable;");
+                    w._($@"var ctrl = ({this.ClassSymbol.ToDisplayString(CommonSymbolDisplayFormat.DefaultFormat)})bindable;");
                     w._($@"return ctrl.{methodName}(ctrl, ({this.FieldSymbol.Type})value);");
                 }
 

diff --git a/src/Maui.BindableProperty.Generator/Helpers/CommonSymbolDisplayFormat.cs b/src/Maui.BindableProperty.Generator/Helpers/CommonSymbolDisplayFormat.cs
@@ -0,0 +1,16 @@
+using Microsoft.CodeAnalysis;
+
+namespace Maui.BindableProperty.Generator.Helpers;
+
+internal static class CommonSymbolDisplayFormat
+{
+    public static SymbolDisplayFormat DefaultFormat { get; } =
+            new SymbolDisplayFormat(
+                globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Included,
+                typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+                genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
+                miscellaneousOptions:
+                    SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers |
+                    SymbolDisplayMiscellaneousOptions.UseSpecialTypes |
+                    SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier);
+}
diff --git a/src/Maui.BindableProperty.Generator/Maui.BindableProperty.Generator.csproj b/src/Maui.BindableProperty.Generator/Maui.BindableProperty.Generator.csproj
@@ -10,7 +10,7 @@
 		<Description>Source generator that automatically transforms fields into BindableProperties that can be used in MAUI</Description>
 		<PackageTags>MAUI;BindableProperty;Source Generator</PackageTags>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<VersionPrefix>0.9.2</VersionPrefix>
+		<VersionPrefix>0.9.3</VersionPrefix>
 		<PackageProjectUrl>https://github.com/rrmanzano/maui-bindableproperty-generator</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/rrmanzano/maui-bindableproperty-generator</RepositoryUrl>
 		<PackageId>M.BindableProperty.Generator</PackageId>