Don't use null in AST

Abc-Arbitrage · Jan 26, 2024 · da966a7 · da966a7
1 parent be01d31
commit da966a7
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 9 deletions.
diff --git a/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/CSharpGeneratorTests.cs b/src/Abc.Zebus.MessageDsl.Tests/MessageDsl/CSharpGeneratorTests.cs
@@ -934,6 +934,13 @@ public async Task should_generate_attributes_on_parameters()
         code.ShouldContain("] int foo");
     }
 
+    [Test]
+    public void should_handle_missing_data()
+    {
+        _ = Generate(new MessageDefinition());
+        _ = Generate(new MessageDefinition { Parameters = { new ParameterDefinition() } });
+    }
+
     protected override string SnapshotExtension => "cs";
 
     protected override string GenerateRaw(ParsedContracts contracts)

diff --git a/src/Abc.Zebus.MessageDsl/Ast/AttributeDefinition.cs b/src/Abc.Zebus.MessageDsl/Ast/AttributeDefinition.cs
@@ -2,7 +2,7 @@
 
 public class AttributeDefinition : AstNode
 {
-    private TypeName _typeName = default!;
+    private TypeName _typeName = TypeName.Empty;
 
     public TypeName TypeName
     {

diff --git a/src/Abc.Zebus.MessageDsl/Ast/EnumDefinition.cs b/src/Abc.Zebus.MessageDsl/Ast/EnumDefinition.cs
@@ -9,7 +9,7 @@ public class EnumDefinition : AstNode, IMemberNode
 {
     private MemberOptions? _options;
 
-    public string Name { get; set; } = default!;
+    public string Name { get; set; } = string.Empty;
     public TypeName UnderlyingType { get; set; } = "int";
     public AccessModifier AccessModifier { get; set; }
     public AttributeSet Attributes { get; } = new();

diff --git a/src/Abc.Zebus.MessageDsl/Ast/EnumMemberDefinition.cs b/src/Abc.Zebus.MessageDsl/Ast/EnumMemberDefinition.cs
@@ -2,7 +2,7 @@
 
 public class EnumMemberDefinition : AstNode, INamedNode
 {
-    public string Name { get; set; } = default!;
+    public string Name { get; set; } = string.Empty;
     public string? Value { get; set; }
     public AttributeSet Attributes { get; } = new();
     internal int? ProtoValue { get; set; }

diff --git a/src/Abc.Zebus.MessageDsl/Ast/GenericConstraint.cs b/src/Abc.Zebus.MessageDsl/Ast/GenericConstraint.cs
@@ -4,7 +4,7 @@ namespace Abc.Zebus.MessageDsl.Ast;
 
 public class GenericConstraint : AstNode
 {
-    public string GenericParameterName { get; set; } = default!;
+    public string GenericParameterName { get; set; } = string.Empty;
 
     public bool IsClass { get; set; }
     public bool IsStruct { get; set; }

diff --git a/src/Abc.Zebus.MessageDsl/Ast/MessageDefinition.cs b/src/Abc.Zebus.MessageDsl/Ast/MessageDefinition.cs
@@ -7,7 +7,7 @@ public class MessageDefinition : AstNode, IClassNode
 {
     private MemberOptions? _options;
 
-    public string Name { get; set; } = default!;
+    public string Name { get; set; } = string.Empty;
     public AccessModifier AccessModifier { get; set; }
     public InheritanceModifier InheritanceModifier { get; set; }
     public IList<string> GenericParameters { get; } = new List<string>();

diff --git a/src/Abc.Zebus.MessageDsl/Ast/ParameterDefinition.cs b/src/Abc.Zebus.MessageDsl/Ast/ParameterDefinition.cs
@@ -3,8 +3,8 @@
 public class ParameterDefinition : AstNode, INamedNode
 {
     public int Tag { get; set; }
-    public string Name { get; set; } = default!;
-    public TypeName Type { get; set; } = default!;
+    public string Name { get; set; } = string.Empty;
+    public TypeName Type { get; set; } = TypeName.Empty;
     public bool IsMarkedOptional { get; set; }
     public string? DefaultValue { get; set; }
     public bool IsWritableProperty { get; set; }

diff --git a/src/Abc.Zebus.MessageDsl/Ast/TypeName.cs b/src/Abc.Zebus.MessageDsl/Ast/TypeName.cs
@@ -69,6 +69,8 @@ public sealed class TypeName : IEquatable<TypeName>
 
     private static readonly HashSet<string> _csharpNonTypeKeywords = CSharpSyntax.EnumerateCSharpKeywords().Except(_aliasTypeMap.Keys).ToHashSet();
 
+    internal static TypeName Empty { get; } = new(null);
+
     static TypeName()
     {
         _clrTypeToAlias = new Dictionary<string, string>();

diff --git a/src/Abc.Zebus.MessageDsl/Generator/GeneratorBase.cs b/src/Abc.Zebus.MessageDsl/Generator/GeneratorBase.cs
@@ -51,10 +51,14 @@ protected string GeneratedOutput()
         => _stringBuilder.ToString();
 
     protected static string ParameterCase(string s)
-        => char.ToLowerInvariant(s[0]) + s.Substring(1);
+        => !string.IsNullOrEmpty(s)
+            ? char.ToLowerInvariant(s[0]) + s.Substring(1)
+            : string.Empty;
 
     protected static string MemberCase(string s)
-        => char.ToUpperInvariant(s[0]) + s.Substring(1);
+        => !string.IsNullOrEmpty(s)
+            ? char.ToUpperInvariant(s[0]) + s.Substring(1)
+            : string.Empty;
 
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly")]
     public void Dispose()