Add proto

robotdotnet · Feb 17, 2024 · f91cbdf · f91cbdf
1 parent 4a5da8f
commit f91cbdf
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/sourcegeneration/StereologueSourceGenerator/LoggableMember.cs b/sourcegeneration/StereologueSourceGenerator/LoggableMember.cs
@@ -34,7 +34,8 @@ internal enum DeclarationKind
     ReadOnlyMemory,
     Memory,
     Array,
-    Nullable,
+    NullableValueType,
+    NullableReferenceType
 }
 
 // Contains all information about a loggable member
@@ -58,7 +59,7 @@ private static DeclarationKind GetInnerType(this ITypeSymbol typeSymbol, out ITy
         {
             namedTypeSymbol = (INamedTypeSymbol)typeSymbol;
             innerType = namedTypeSymbol.TypeArguments[0];
-            return DeclarationKind.Nullable;
+            return DeclarationKind.NullableValueType;
         }
 
         var fmt = new SymbolDisplayFormat(typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces);
@@ -83,7 +84,7 @@ private static DeclarationKind GetInnerType(this ITypeSymbol typeSymbol, out ITy
         }
 
         innerType = typeSymbol;
-        return innerType.IsReferenceType ? DeclarationKind.Nullable : DeclarationKind.None;
+        return innerType.IsReferenceType ? DeclarationKind.NullableReferenceType : DeclarationKind.None;
     }
 
     private static (DeclarationType, DeclarationKind)? GetDeclarationType(this ITypeSymbol typeSymbol, LogAttributeInfo attributeInfo, CancellationToken token)
@@ -162,7 +163,7 @@ private static (DeclarationType, DeclarationKind)? GetDeclarationType(this IType
         }
 
         // Special case non nested and nullables
-        if (nestedKind == DeclarationKind.None || nestedKind == DeclarationKind.Nullable)
+        if (nestedKind == DeclarationKind.None || nestedKind == DeclarationKind.NullableReferenceType || nestedKind == DeclarationKind.NullableValueType)
         {
             return (fullTypeName switch
             {

diff --git a/sourcegeneration/StereologueSourceGenerator/LoggableType.cs b/sourcegeneration/StereologueSourceGenerator/LoggableType.cs
@@ -173,18 +173,35 @@ private static void ConstructCall(LoggableMember data, StringBuilder builder, So
 
         if (data.LoggedType == DeclarationType.Protobuf)
         {
+            if (data.LoggedKind != DeclarationKind.None && data.LoggedKind != DeclarationKind.NullableValueType && data.LoggedKind != DeclarationKind.NullableReferenceType)
+            {
+                builder.Append("Cannot log an array of protobufs");
+            }
+            if (data.LoggedKind == DeclarationKind.NullableValueType)
+            {
+                getOperation = $"{getOperation}.GetValueOrDefault()";
+            }
+            builder.Append("logger.LogProto($\"{path}/");
+            builder.Append(path);
+            builder.Append("\", ");
+            builder.Append(data.AttributeInfo.LogType);
+            builder.Append(", ");
+            builder.Append(getOperation);
+            builder.Append(", ");
+            builder.Append(data.AttributeInfo.LogLevel);
+            builder.Append(");");
             return;
         }
 
         string logMethod;
 
-        if (data.LoggedKind == DeclarationKind.None || data.LoggedKind == DeclarationKind.Nullable)
+        if (data.LoggedKind == DeclarationKind.None || data.LoggedKind == DeclarationKind.NullableReferenceType || data.LoggedKind == DeclarationKind.NullableValueType)
         {
             if (data.LoggedType == DeclarationType.String)
             {
                 getOperation = $"{getOperation}.AsSpan()";
             }
-            else if (data.LoggedKind == DeclarationKind.Nullable)
+            else if (data.LoggedKind == DeclarationKind.NullableValueType)
             {
                 getOperation = $"{getOperation}.GetValueOrDefault()";
             }

diff --git a/test/stereologue.test/TestTree.cs b/test/stereologue.test/TestTree.cs
@@ -163,6 +163,9 @@ public partial class GenerateAllKnownTypes
     [Log(UseProtobuf = true)]
     public Rotation2d RotationProto => new();
 
+        [Log(UseProtobuf = true)]
+    public Rotation2d? RotationProtoNullable => null;
+
     [Log()]
     public Rotation2d[] RotationArray = [];