fix nullable

Author: chaowlert

ExpressionDebugger.Tests/DebugInfoInjectorTest.cs

@@ -723,12 +723,14 @@ public void TestProperties()
             {
                 IsStatic = false,
                 Namespace = "ExpressionDebugger.Tests",
-                TypeName = "MockClass"
+                TypeName = "MockClass",
+                NullableContext = 2,
             });
             translator.Properties.Add(new PropertyDefinitions
             {
                 Name = "Prop1",
-                Type = typeof(string)
+                Type = typeof(string),
+                NullableContext = 0,
             });
             translator.Properties.Add(new PropertyDefinitions
             {
@@ -741,7 +743,8 @@ public void TestProperties()
             {
                 Name = "Prop3",
                 Type = typeof(string),
-                IsInitOnly = true
+                IsInitOnly = true,
+                NullableContext = 0,
             });
             var str = translator.ToString();
             Assert.AreEqual(@"

ExpressionTranslator/ExpressionTranslator.cs

@@ -422,7 +422,7 @@ private string TranslateNullable(Type type, byte? nullableContext, byte[]? nulla
         public string Translate(Type type)
         {
             var refNullable = !type.GetTypeInfo().IsValueType &&
-                              (_nilCtx == 2 || _nilIndex < _nil?.Length && _nil[_nilIndex++] == 2);
+                              (_nilIndex < _nil?.Length ? _nil[_nilIndex++] == 2 : _nilCtx == 2);
             var typeName = TranslateInner(type);
             return refNullable ? $"{typeName}?" : typeName;
         }

ExpressionTranslator/ExpressionTranslator.csproj

@@ -12,7 +12,7 @@
     <SignAssembly>True</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <AssemblyOriginatorKeyFile>ExpressionTranslator.snk</AssemblyOriginatorKeyFile>
-    <Version>2.4.2</Version>
+    <Version>2.4.3</Version>
     <RootNamespace>ExpressionDebugger</RootNamespace>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageIcon>icon.png</PackageIcon>
@@ -33,10 +33,6 @@
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />	
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="ExpressionTranslator.cs~RFe80e7f7.TMP" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>

ExpressionTranslator/PropertyDefinitions.cs

@@ -10,7 +10,16 @@ public class PropertyDefinitions
         public string Name { get; set; }
         public bool IsReadOnly { get; set; }
         public bool IsInitOnly { get; set; }
+
+        /// <summary>
+        /// Set to 2 to mark type as nullable
+        /// </summary>
         public byte? NullableContext { get; set; }
+
+        /// <summary>
+        /// If type is generic, array or tuple, you can mark nullable for each type
+        /// Set to 2 for nullable
+        /// </summary>
         public byte[]? Nullable { get; set; }
     }
 }

ExpressionTranslator/TypeDefinitions.cs

@@ -12,6 +12,10 @@ public class TypeDefinitions
         public IEnumerable<Type>? Implements { get; set; }
         public bool PrintFullTypeName { get; set; }
         public bool IsRecordType { get; set; }
+
+        /// <summary>
+        /// Set to 2 to mark all properties as nullable
+        /// </summary>
         public byte? NullableContext { get; set; }
     }
 }