Fix issue #33

KafkaWannaFly · Apr 11, 2023 · 7b8507d · 7b8507d
1 parent 53b2148
commit 7b8507d
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 7 deletions.
diff --git a/BindableProps/BindableProps.csproj b/BindableProps/BindableProps.csproj
@@ -13,7 +13,7 @@
         <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
         <PackageTags>source-generator;maui;net-6;utility;helper</PackageTags>
         <PackageProjectUrl>https://github.com/KafkaWannaFly/BindableProps</PackageProjectUrl>
-        <Version>1.3.4</Version>
+        <Version>1.3.5-beta</Version>
         <RepositoryUrl>https://github.com/KafkaWannaFly/BindableProps</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -44,8 +44,7 @@
         <None Include="..\BindablePropsSG\bin\$(Configuration)\netstandard2.0\BindablePropsSG.dll" PackagePath="analyzers\dotnet\cs" Pack="true" Visible="false" />
     </ItemGroup>
 
-    <!-- Enable trimming support on .NET 6 -->
-    <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0'">
         <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
         <IsTrimmable>true</IsTrimmable>
     </PropertyGroup>

diff --git a/BindablePropsSG/Generators/AllBindablePropsSG.cs b/BindablePropsSG/Generators/AllBindablePropsSG.cs
@@ -126,6 +126,13 @@ protected override void ProcessField(StringBuilder source, ClassDeclarationSynta
             var propName = StringUtil.PascalCaseOf(fieldName);
             var dataType = fieldSyntax.Declaration.Type;
 
+            // typeof operation doesn't accept nullable data type
+            var unNullableDataType = dataType.ToString();
+            if (unNullableDataType[unNullableDataType.Length - 1] == '?')
+            {
+                unNullableDataType = unNullableDataType.Substring(0, unNullableDataType.Length - 1);
+            }
+
             var className = classDeclarationSyntax.Identifier.ToString();
 
             var variableDeclaratorSyntax = fieldSyntax.ChildNodes().OfType<VariableDeclarationSyntax>().FirstOrDefault()
@@ -138,7 +145,7 @@ protected override void ProcessField(StringBuilder source, ClassDeclarationSynta
             source.Append($@"
         public static readonly BindableProperty {propName}Property = BindableProperty.Create(
                     nameof({propName}),
-                    typeof({dataType}),
+                    typeof({unNullableDataType}),
                     typeof({className}),
                     {defaultValue},
                     propertyChanged: (bindable, oldValue, newValue) =>

diff --git a/BindablePropsSG/Generators/AttachedPropSG.cs b/BindablePropsSG/Generators/AttachedPropSG.cs
@@ -33,6 +33,13 @@ protected override void ProcessField(StringBuilder source, ClassDeclarationSynta
         var fieldSyntax = (FieldDeclarationSyntax)syntaxNode;
 
         var fieldType = fieldSyntax.Declaration.Type;
+
+        // typeof operation doesn't accept nullable data type
+        var unNullableDataType = fieldType.ToString();
+        if (unNullableDataType[unNullableDataType.Length - 1] == '?')
+        {
+            unNullableDataType = unNullableDataType.Substring(0, unNullableDataType.Length - 1);
+        }
 
         var className = classSyntax.Identifier;
 
@@ -60,7 +67,7 @@ protected override void ProcessField(StringBuilder source, ClassDeclarationSynta
         source.Append($@"
         public static readonly BindableProperty {propName} = BindableProperty.CreateAttached(
             ""{pascalCaseFieldName}"",
-            typeof({fieldType}),
+            typeof({unNullableDataType}),
             typeof({className}),
             {defaultFieldValue},
             (BindingMode){defaultBindingMode},

diff --git a/BindablePropsSG/Generators/BindablePropSG.cs b/BindablePropsSG/Generators/BindablePropSG.cs
@@ -31,6 +31,13 @@ protected override void ProcessField(StringBuilder source, ClassDeclarationSynta
 
             var fieldSyntax = (FieldDeclarationSyntax)syntaxNode;
             var fieldType = fieldSyntax.Declaration.Type;
+
+            // typeof operation doesn't accept nullable data type
+            var unNullableDataType = fieldType.ToString();
+            if (unNullableDataType[unNullableDataType.Length - 1] == '?')
+            {
+                unNullableDataType = unNullableDataType.Substring(0, unNullableDataType.Length - 1);
+            }
 
             var className = classSyntax.Identifier;
 
@@ -61,7 +68,7 @@ protected override void ProcessField(StringBuilder source, ClassDeclarationSynta
             source.Append($@"
         public static readonly BindableProperty {propName}Property = BindableProperty.Create(
             nameof({propName}),
-            typeof({fieldType}),
+            typeof({unNullableDataType}),
             typeof({className}),
             {defaultFieldValue},
             (BindingMode){defaultBindingMode},

diff --git a/UnitTest/TestData/BindablePropTest/SimpleUsage.expected.txt b/UnitTest/TestData/BindablePropTest/SimpleUsage.expected.txt
@@ -59,5 +59,33 @@ namespace UnitTest.TestData.BindablePropTest
                 OnPropertyChanged(nameof(Description));
             }
         }
+
+        public static readonly BindableProperty SideNoteProperty = BindableProperty.Create(
+                    nameof(SideNote),
+                    typeof(string),
+                    typeof(SimpleUsage),
+                    default,
+                    (BindingMode)0,
+                    null,
+                    (bindable, oldValue, newValue) => 
+                                ((SimpleUsage)bindable).SideNote = (string?)newValue,
+                    null,
+                    null,
+                    null
+                );
+
+        public string? SideNote
+        {
+            get => sideNote;
+            set 
+            {
+                OnPropertyChanging(nameof(SideNote));
+
+                sideNote = value;
+                SetValue(SimpleUsage.SideNoteProperty, sideNote);
+
+                OnPropertyChanged(nameof(SideNote));
+            }
+        }
     }
 }
diff --git a/UnitTest/TestData/BindablePropTest/SimpleUsage.txt b/UnitTest/TestData/BindablePropTest/SimpleUsage.txt
@@ -7,5 +7,8 @@
 
         [BindableProp]
         string description = "To the moon";
+
+        [BindableProp]
+        string? sideNote;
     }
 }
diff --git a/UnitTest/UnitTest.csproj b/UnitTest/UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>