Unconditionally generate C# classes with nullable reference types

Fixes microsoft#3944
0xced · Dec 21, 2023 · e862299 · e862299
1 parent 5103657
commit e862299
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 36 deletions.
diff --git a/src/Kiota.Builder/Writers/CSharp/CSharpConventionService.cs b/src/Kiota.Builder/Writers/CSharp/CSharpConventionService.cs
@@ -19,23 +19,6 @@ public class CSharpConventionService : CommonLanguageConventionService
  public static string NullableMarkerAsString => "?";
  public override string ParseNodeInterfaceName => "IParseNode";
 
- public static void WriteNullableOpening(LanguageWriter writer)
- {
- ArgumentNullException.ThrowIfNull(writer);
- writer.WriteLine($"#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER", false);
- writer.WriteLine($"#nullable enable", false);
- }
- public static void WriteNullableMiddle(LanguageWriter writer)
- {
- ArgumentNullException.ThrowIfNull(writer);
- writer.WriteLine($"#nullable restore", false);
- writer.WriteLine("#else", false);
- }
- public static void WriteNullableClosing(LanguageWriter writer)
- {
- ArgumentNullException.ThrowIfNull(writer);
- writer.WriteLine("#endif", false);
- }
  public override void WriteShortDescription(string description, LanguageWriter writer)
  {
  ArgumentNullException.ThrowIfNull(writer);

diff --git a/src/Kiota.Builder/Writers/CSharp/CodeClassDeclarationWriter.cs b/src/Kiota.Builder/Writers/CSharp/CodeClassDeclarationWriter.cs
@@ -7,6 +7,7 @@ namespace Kiota.Builder.Writers.CSharp;
 public class CodeClassDeclarationWriter : BaseElementWriter<ClassDeclaration, CSharpConventionService>
 {
  public static string AutoGenerationHeader => "// <auto-generated/>";
+ public static string NullableHeader => "#nullable enable";
  public CodeClassDeclarationWriter(CSharpConventionService conventionService) : base(conventionService) { }
  public override void WriteCodeElement(ClassDeclaration codeElement, LanguageWriter writer)
  {
@@ -17,6 +18,7 @@ public override void WriteCodeElement(ClassDeclaration codeElement, LanguageWrit
  if (codeElement.Parent?.Parent is CodeNamespace)
  {
  writer.WriteLine(AutoGenerationHeader);
+ writer.WriteLine(NullableHeader);
  codeElement.Usings
  .Where(x => (x.Declaration?.IsExternal ?? true) || !x.Declaration.Name.Equals(codeElement.Name, StringComparison.OrdinalIgnoreCase)) // needed for circular requests patterns like message folder
  .Select(static x => x.Declaration?.IsExternal ?? false ?

diff --git a/src/Kiota.Builder/Writers/CSharp/CodeMethodWriter.cs b/src/Kiota.Builder/Writers/CSharp/CodeMethodWriter.cs
@@ -611,16 +611,12 @@ private void WriteMethodPrototype(CodeMethod code, CodeClass parentClass, Langua
  GetParameterSignatureWithNullableRefType(p, code) :
  conventions.GetParameterSignature(p, code))
  .ToList());
- CSharpConventionService.WriteNullableOpening(writer);
  writer.WriteLine($"{conventions.GetAccessModifier(code.Access)} {staticModifier}{hideModifier}{completeReturnTypeWithNullable}{methodName}({nullableParameters}){baseSuffix} {{");
- CSharpConventionService.WriteNullableMiddle(writer);
  }
-
- writer.WriteLine($"{conventions.GetAccessModifier(code.Access)} {staticModifier}{hideModifier}{completeReturnType}{methodName}({parameters}){baseSuffix} {{");
-
- if (includeNullableReferenceType)
- CSharpConventionService.WriteNullableClosing(writer);
-
+ else
+ {
+ writer.WriteLine($"{conventions.GetAccessModifier(code.Access)} {staticModifier}{hideModifier}{completeReturnType}{methodName}({parameters}){baseSuffix} {{");
+ }
  }
 
  private string GetParameterSignatureWithNullableRefType(CodeParameter parameter, CodeElement targetElement)

diff --git a/src/Kiota.Builder/Writers/CSharp/CodePropertyWriter.cs b/src/Kiota.Builder/Writers/CSharp/CodePropertyWriter.cs
@@ -18,17 +18,7 @@ public override void WriteCodeElement(CodeProperty codeElement, LanguageWriter w
  CodePropertyKind.QueryParameter);// Other property types are appropriately constructor initialized
  conventions.WriteShortDescription(codeElement.Documentation.Description, writer);
  conventions.WriteDeprecationAttribute(codeElement, writer);
- if (isNullableReferenceType)
- {
- CSharpConventionService.WriteNullableOpening(writer);
- WritePropertyInternal(codeElement, writer, $"{propertyType}?");
- CSharpConventionService.WriteNullableMiddle(writer);
- }
-
- WritePropertyInternal(codeElement, writer, propertyType);// Always write the normal way
-
- if (isNullableReferenceType)
- CSharpConventionService.WriteNullableClosing(writer);
+ WritePropertyInternal(codeElement, writer, isNullableReferenceType ? $"{propertyType}?" : propertyType);
  }
 
  private void WritePropertyInternal(CodeProperty codeElement, LanguageWriter writer, string propertyType)