Yeet away FQN

robotdotnet · Feb 18, 2024 · a5d8a97 · a5d8a97
1 parent 13901ae
commit a5d8a97
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/sourcegeneration/StereologueSourceGenerator/LoggableMember.cs b/sourcegeneration/StereologueSourceGenerator/LoggableMember.cs
@@ -32,7 +32,7 @@ internal enum DeclarationKind
     NullableReferenceType
 }
 
-internal record MemberDeclaration(DeclarationType LoggedType, SpecialType SpecialType, DeclarationKind LoggedKind, string? FQN);
+internal record MemberDeclaration(DeclarationType LoggedType, SpecialType SpecialType, DeclarationKind LoggedKind);
 
 // Contains all information about a loggable member
 internal record LoggableMember(string Name, MemberType MemberType, MemberDeclaration MemberDeclaration, LogAttributeInfo AttributeInfo);
@@ -96,19 +96,19 @@ private static DeclarationKind GetInnerType(this ITypeSymbol typeSymbol, out ITy
         if (typeSymbol.SpecialType != SpecialType.None)
         {
             // We're a built in special type, no need to check for anything else
-            return new(DeclarationType.SpecialType, typeSymbol.SpecialType, nestedKind, null);
+            return new(DeclarationType.SpecialType, typeSymbol.SpecialType, nestedKind);
         }
 
         // If we know we're generating a loggable implementation
         if (typeSymbol.GetAttributes().Where(x => x.AttributeClass?.ToDisplayString() == "Stereologue.GenerateLogAttribute").Any())
         {
-            return new(DeclarationType.Logged, SpecialType.None, nestedKind, null);
+            return new(DeclarationType.Logged, SpecialType.None, nestedKind);
         }
         token.ThrowIfCancellationRequested();
         // If we know we already implement ILogged
         if (typeSymbol.AllInterfaces.Where(x => x.ToDisplayString() == "Stereologue.ILogged").Any())
         {
-            return new(DeclarationType.Logged, SpecialType.None, nestedKind, null);
+            return new(DeclarationType.Logged, SpecialType.None, nestedKind);
         }
         token.ThrowIfCancellationRequested();
         // If we have an UpdateMonologue function
@@ -132,7 +132,7 @@ private static DeclarationKind GetInnerType(this ITypeSymbol typeSymbol, out ITy
                 }
                 if (parameters[0].Type.SpecialType == SpecialType.System_String && parameters[1].Type.ToDisplayString() == "Stereologue.Stereologuer")
                 {
-                    return new(DeclarationType.Logged, SpecialType.None, nestedKind, null);
+                    return new(DeclarationType.Logged, SpecialType.None, nestedKind);
                 }
             }
         }
@@ -153,20 +153,20 @@ private static DeclarationKind GetInnerType(this ITypeSymbol typeSymbol, out ITy
             {
                 if (!attributeInfo.UseProtobuf)
                 {
-                    return new(DeclarationType.Struct, SpecialType.None, nestedKind, typeSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
+                    return new(DeclarationType.Struct, SpecialType.None, nestedKind);
                 }
             }
             else if (interfaceName == protobufName)
             {
                 if (attributeInfo.UseProtobuf)
                 {
-                    return new(DeclarationType.Protobuf, SpecialType.None, nestedKind, typeSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
+                    return new(DeclarationType.Protobuf, SpecialType.None, nestedKind);
                 }
             }
         }
 
         // We get here by attempting to log a type we have no clue about
-        return new(DeclarationType.None, SpecialType.None, DeclarationKind.None, null);
+        return new(DeclarationType.None, SpecialType.None, DeclarationKind.None);
     }
 
     public static LoggableMember? ToLoggableMember(this ISymbol member, CancellationToken token)

diff --git a/sourcegeneration/StereologueSourceGenerator/LoggableType.cs b/sourcegeneration/StereologueSourceGenerator/LoggableType.cs
@@ -86,11 +86,11 @@ private static void ConstructCall(LoggableMember data, StringBuilder builder, So
             if (data.MemberDeclaration.LoggedKind != DeclarationKind.None && data.MemberDeclaration.LoggedKind != DeclarationKind.NullableValueType && data.MemberDeclaration.LoggedKind != DeclarationKind.NullableReferenceType)
             {
                 // We're an array
-                logMethod = $"LogStructArray<{data.MemberDeclaration.FQN}>";
+                logMethod = "LogStructArray";
             }
             else
             {
-                logMethod = $"LogStruct<{data.MemberDeclaration.FQN}>";
+                logMethod = "LogStruct";
             }
             if (data.MemberDeclaration.LoggedKind == DeclarationKind.NullableValueType)
             {
@@ -107,7 +107,7 @@ private static void ConstructCall(LoggableMember data, StringBuilder builder, So
             }
             else
             {
-                logMethod = $"LogProto<{data.MemberDeclaration.FQN}>";
+                logMethod = "LogProto";
             }
             if (data.MemberDeclaration.LoggedKind == DeclarationKind.NullableValueType)
             {

diff --git a/src/thirdparty/Stereologue/Stereologuer.cs b/src/thirdparty/Stereologue/Stereologuer.cs
@@ -112,6 +112,18 @@ public void LogStruct<T>(string path, LogType logType, in T value, LogLevel logL
         }
     }
 
+    public void LogStructArray<T>(string path, LogType logType, T[]? value, LogLevel logLevel = LogLevel.Default) where T : IStructSerializable<T>
+    {
+        ReadOnlySpan<T> ros = value.AsSpan();
+        LogStructArray(path, logType, ros, logLevel);
+    }
+
+    public void LogStructArray<T>(string path, LogType logType, Span<T> value, LogLevel logLevel = LogLevel.Default) where T : IStructSerializable<T>
+    {
+        ReadOnlySpan<T> ros = value;
+        LogStructArray(path, logType, ros, logLevel);
+    }
+
     public void LogStructArray<T>(string path, LogType logType, ReadOnlySpan<T> value, LogLevel logLevel = LogLevel.Default) where T : IStructSerializable<T>
     {
         ref var logs = ref CheckDoLog(path, ref logType, logLevel, structArrayLogs);

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