IOC hints needs to contain full type name.

Bobris · Jan 29, 2024 · 3d16a3e · 3d16a3e
1 parent 344fb1f
commit 3d16a3e
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 4 deletions.
diff --git a/BTDB.SourceGenerator.Test/GeneratorTestsBase.cs b/BTDB.SourceGenerator.Test/GeneratorTestsBase.cs
@@ -31,8 +31,11 @@ protected static Task VerifySourceGenerator(string sourceCode)
         // Assert the driver doesn't recompute the output
         var result = runResult2.GetRunResult().Results.Single();
         var allOutputs = result.TrackedOutputSteps.SelectMany(outputStep => outputStep.Value)
-            .SelectMany(output => output.Outputs);
-        Assert.Collection(allOutputs, output => Assert.Equal(IncrementalStepRunReason.Cached, output.Reason));
+            .SelectMany(output => output.Outputs).ToList();
+        if (allOutputs.Count != 0)
+        {
+            Assert.Collection(allOutputs, output => Assert.Equal(IncrementalStepRunReason.Cached, output.Reason));
+        }
 
         return Verifier.Verify(runResult);
     }

diff --git a/...lasses#TestNamespace.Logger.g.verified.cs → ...s#TestNamespace.Logger[int].g.verified.cs b/...lasses#TestNamespace.Logger.g.verified.cs → ...s#TestNamespace.Logger[int].g.verified.cs
@@ -1,4 +1,4 @@
-//HintName: TestNamespace.Logger.g.cs
+//HintName: TestNamespace.Logger[int].g.cs
 // <auto-generated/>
 #pragma warning disable 612,618
 using System;

diff --git a/...rCouldBeUsedForGenericClassesWithMultipleVariants#TestNamespace.Logger[int].g.verified.cs b/...rCouldBeUsedForGenericClassesWithMultipleVariants#TestNamespace.Logger[int].g.verified.cs
@@ -0,0 +1,25 @@
+//HintName: TestNamespace.Logger[int].g.cs
+// <auto-generated/>
+#pragma warning disable 612,618
+using System;
+using System.Runtime.CompilerServices;
+
+namespace TestNamespace;
+
+static file class LoggerRegistration
+{
+    [ModuleInitializer]
+    internal static unsafe void Register4BTDB()
+    {
+        global::BTDB.IOC.IContainer.RegisterFactory(typeof(global::TestNamespace.Logger<int>), (container, ctx) =>
+        {
+            var f0 = container.CreateFactory(ctx, typeof(int), "a");
+            if (f0 == null) throw new global::System.ArgumentException("Cannot resolve int a parameter of TestNamespace.Logger<int>");
+            return (container2, ctx2) =>
+            {
+                var res = new global::TestNamespace.Logger<int>((int)(f0(container2, ctx2)));
+                return res;
+            };
+        });
+    }
+}
diff --git a/...uldBeUsedForGenericClassesWithMultipleVariants#TestNamespace.Logger[string].g.verified.cs b/...uldBeUsedForGenericClassesWithMultipleVariants#TestNamespace.Logger[string].g.verified.cs
@@ -0,0 +1,25 @@
+//HintName: TestNamespace.Logger[string].g.cs
+// <auto-generated/>
+#pragma warning disable 612,618
+using System;
+using System.Runtime.CompilerServices;
+
+namespace TestNamespace;
+
+static file class LoggerRegistration
+{
+    [ModuleInitializer]
+    internal static unsafe void Register4BTDB()
+    {
+        global::BTDB.IOC.IContainer.RegisterFactory(typeof(global::TestNamespace.Logger<string>), (container, ctx) =>
+        {
+            var f0 = container.CreateFactory(ctx, typeof(string), "a");
+            if (f0 == null) throw new global::System.ArgumentException("Cannot resolve string a parameter of TestNamespace.Logger<string>");
+            return (container2, ctx2) =>
+            {
+                var res = new global::TestNamespace.Logger<string>(Unsafe.As<string>(f0(container2, ctx2)));
+                return res;
+            };
+        });
+    }
+}
diff --git a/BTDB.SourceGenerator.Test/IOCTests.cs b/BTDB.SourceGenerator.Test/IOCTests.cs
@@ -461,6 +461,28 @@ public Logger(T a)
             ");
     }
 
+    [Fact]
+    public Task VerifyGenerateForCouldBeUsedForGenericClassesWithMultipleVariants()
+    {
+        // language=cs
+        return VerifySourceGenerator(@"
+            namespace TestNamespace;
+
+            public interface ILogger
+            {
+            }
+
+            [BTDB.GenerateFor(typeof(Logger<int>))]
+            [BTDB.GenerateFor(typeof(Logger<string>))]
+            public class Logger<T>: ILogger
+            {
+                public Logger(T a)
+                {
+                }
+            }
+            ");
+    }
+
     [Fact]
     public Task VerifyGenerateForCouldBeUsedForChoosingDifferentConstructor()
     {

diff --git a/BTDB.SourceGenerator/Main.cs b/BTDB.SourceGenerator/Main.cs
@@ -968,7 +968,7 @@ internal static unsafe void Register4BTDB()
             """;
 
         context.AddSource(
-            $"{(generationInfo.Namespace == null ? "" : generationInfo.Namespace + ".") + generationInfo.Name}.g.cs",
+            $"{generationInfo.FullName.Replace("global::","").Replace("<","[").Replace(">","]")}.g.cs",
             SourceText.From(code, Encoding.UTF8));
     }
 }