Finer grained determination of visibility for extension methods

src/Directory.Build.props

@@ -17,7 +17,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.9.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.4.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>

src/dotVariant.Generator.Test/GeneratorTools.cs

@@ -21,7 +21,7 @@ namespace dotVariant.Generator.Test
 {
     internal static class GeneratorTools
     {
-        public static Dictionary<string, string> GetGeneratedOutput(IDictionary<string, string> sources, Func<ISourceGenerator> makeGenerator, bool failOnInvalidSource = false)
+        public static Dictionary<string, string> GetGeneratedOutput(IDictionary<string, string> sources, Func<IIncrementalGenerator> makeGenerator, bool failOnInvalidSource = false)
         {
             var compilation = Compile(sources);
 
@@ -41,10 +41,10 @@ public static Dictionary<string, string> GetGeneratedOutput(IDictionary<string,
         }
 
         public static Dictionary<string, string> GetGeneratedOutput<TGenerator>(IDictionary<string, string> sources, bool failOnInvalidSource = false)
-            where TGenerator : ISourceGenerator, new()
+            where TGenerator : IIncrementalGenerator, new()
             => GetGeneratedOutput(sources, () => new TGenerator(), failOnInvalidSource);
 
-        public static ImmutableArray<Diagnostic> GetGeneratorDiagnostics(IDictionary<string, string> sources, Func<ISourceGenerator> makeGenerator)
+        public static ImmutableArray<Diagnostic> GetGeneratorDiagnostics(IDictionary<string, string> sources, Func<IIncrementalGenerator> makeGenerator)
         {
             var compilation = Compile(sources);
 
@@ -57,7 +57,7 @@ public static ImmutableArray<Diagnostic> GetGeneratorDiagnostics(IDictionary<str
         }
 
         public static ImmutableArray<Diagnostic> GetGeneratorDiagnostics<TGenerator>(IDictionary<string, string> sources)
-            where TGenerator : ISourceGenerator, new()
+            where TGenerator : IIncrementalGenerator, new()
             => GetGeneratorDiagnostics(sources, () => new TGenerator());
 
         public static CSharpCompilation Compile(

src/dotVariant.Generator.Test/RenderInfo.cs

@@ -22,12 +22,11 @@ private static ImmutableArray<RenderInfo> GetRenderInfoFromCompilation(
         {
             var compilation = Compile(SupportSources.Add("input", source), version);
             var generator = new SourceGenerator();
-            var driver = CSharpGeneratorDriver.Create(
-                new[] { generator },
-                optionsProvider: new AnalyzerConfigOptionsProvider(msBuildProperties),
-                parseOptions: new CSharpParseOptions(version));
+            var driver = CSharpGeneratorDriver.Create(generator)
+                .WithUpdatedAnalyzerConfigOptions(new AnalyzerConfigOptionsProvider(msBuildProperties))
+                .WithUpdatedParseOptions(new CSharpParseOptions(version));
             _ = driver.RunGeneratorsAndUpdateCompilation(compilation, out var _, out var _);
-            return generator.RenderInfos;
+            return generator.RenderInfos.ToImmutableArray();
         }
     }
 }

src/dotVariant.Generator.Test/SourceGenerator.Test.cs

@@ -22,17 +22,21 @@ namespace dotVariant.Generator.Test
     internal static class SourceGenerator_Test
     {
         [TestCaseSource(nameof(TranslationCases))]
-        public static void Translation(string typeName, string fileName, string input, string expected)
+        public static void Translation(string[] typeNames, string fileName, string input, string expected)
         {
             var sources = SupportSources.Add("input", input);
             var outputs = GetGeneratedOutput<SourceGenerator>(sources, true);
-            var file =
-                Path.Combine(
-                    $"{typeof(SourceGenerator).Assembly.GetName().Name}",
-                    $"{typeof(SourceGenerator).FullName}",
-                    $"{typeName}.cs");
-            var output = outputs[file];
-            output = _copyrightHeader + output;
+
+            var output = _copyrightHeader;
+            foreach (var typeName in typeNames)
+            {
+                var file =
+                    Path.Combine(
+                        $"{typeof(SourceGenerator).Assembly.GetName().Name}",
+                        $"{typeof(SourceGenerator).FullName}",
+                        $"{typeName}.cs");
+                output += outputs[file];
+            }
 
             if (output != expected)
             {
@@ -69,23 +73,24 @@ private static void WriteSample(string name, string content)
         }
 
         public static IEnumerable<TestCaseData> TranslationCases()
-            => new (string FileName, string TypeName)[]
+            => new (string FileName, string[] TypeName)[]
                 {
-                    ("Variant-class-nullable-disable", "Foo.Variant_class_nullable_disable"),
-                    ("Variant-class-nullable-enable", "Foo.Variant_class_nullable_enable"),
-                    ("Variant-disposable", "Foo.Variant_disposable"),
-                    ("Variant-generic-class", "Foo.Variant{T}"),
-                    ("Variant-generic-class-nullable", "Foo.Variant{T}"),
-                    ("Variant-generic-multiple", "Foo.Variant{T1, T2, T3}"),
-                    ("Variant-generic-notnull", "Foo.Variant{T}"),
-                    ("Variant-generic-struct", "Foo.Variant{T}"),
-                    ("Variant-generic-T-as-nullable", "Foo.Variant{T1, T2, T3, T4, T5, T6}"),
-                    ("Variant-generic-unbounded", "Foo.Variant{T}"),
-                    ("Variant-nullable-value-type", "Foo.Variant_nullable_value_type"),
-                    ("Variant-public", "Foo.Variant_public"),
-                    ("Variant-no-implicit-conversion", "Foo.Variant_no_implicit_conversion"),
-                    ("Variant-struct-nullable-disable", "Foo.Variant_struct_nullable_disable"),
-                    ("Variant-struct-nullable-enable", "Foo.Variant_struct_nullable_enable"),
+                    ("Variant-class-nullable-disable",new[] {  "Foo.Variant_class_nullable_disable" }),
+                    ("Variant-class-nullable-enable", new[] { "Foo.Variant_class_nullable_enable" }),
+                    ("Variant-disposable", new[] { "Foo.Variant_disposable" }),
+                    ("Variant-generic-class", new[] { "Foo.Variant{T}" }),
+                    ("Variant-generic-class-nullable", new[] { "Foo.Variant{T}" }),
+                    ("Variant-generic-multiple", new[] { "Foo.Variant{T1, T2, T3}" }),
+                    ("Variant-generic-notnull", new[] { "Foo.Variant{T}" }),
+                    ("Variant-generic-struct", new[] { "Foo.Variant{T}" }),
+                    ("Variant-generic-T-as-nullable", new[] { "Foo.Variant{T1, T2, T3, T4, T5, T6}" }),
+                    ("Variant-generic-unbounded", new[] { "Foo.Variant{T}" }),
+                    ("Variant-nullable-value-type", new[] { "Foo.Variant_nullable_value_type" }),
+                    ("Variant-public", new[] { "Foo.Variant_public" }),
+                    ("Variant-no-implicit-conversion", new[] { "Foo.Variant_no_implicit_conversion" }),
+                    ("Variant-struct-nullable-disable", new[] { "Foo.Variant_struct_nullable_disable" }),
+                    ("Variant-struct-nullable-enable", new[] { "Foo.Variant_struct_nullable_enable" }),
+                    ("Variant-generic-same-name", new[] { "Foo.Variant{T}", "Foo.Variant{T1, T2}" })
                 }
                 .Select(
                     test => new TestCaseData(

src/dotVariant.Generator.Test/dotVariant.Generator.Test.csproj

@@ -6,13 +6,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IsExternalInit" Version="1.0.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
-    <PackageReference Include="NUnit" Version="3.13.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="System.Interactive" Version="5.0.0" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
+    <PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="System.Interactive" Version="6.0.1" />
+    <PackageReference Include="System.Reactive" Version="6.0.0" />
+    <PackageReference Include="Verify.NUnit" Version="20.4.0" />
+    <PackageReference Include="Verify.SourceGenerators" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

src/dotVariant.Generator.Test/samples/Variant-generic-T-as-nullable.out.cs

@@ -1,4 +1,4 @@
-//
+//
 // Copyright Miro Knejp 2021.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
@@ -1702,7 +1702,7 @@ namespace Foo
     /// Extensions which allow for easy and powerful integration into `System.Linq`-like queries
     /// on <see cref="global::System.Collections.Generic.IEnumerable{T}" /> sequences, that let you manipulate a stream of variants based on the contained type.
     /// </summary>
-    public static partial class VariantEx
+    public static partial class Variant_T1_T2_T3_T4_T5_T6_Ex
     {
         /// <summary>
         /// Transform a Variant-based enumerable sequence by applying a selector function to those elements
@@ -2388,7 +2388,7 @@ namespace Foo
     /// Extensions which allow for easy and powerful integration into `System.Reactive.Linq`-like queries
     /// on <see cref="global::System.IObservable{T}" /> sequences, that let you manipulate an asynchronous stream of variants based on the contained type.
     /// </summary>
-    public static partial class VariantEx
+    public static partial class Variant_T1_T2_T3_T4_T5_T6_Ex
     {
         /// <summary>
         /// Projects each <see cref="T1?"/> element of an observable sequence

src/dotVariant.Generator.Test/samples/Variant-generic-class-nullable.out.cs

@@ -1,4 +1,4 @@
-//
+//
 // Copyright Miro Knejp 2021.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
@@ -518,7 +518,7 @@ namespace Foo
     /// Extensions which allow for easy and powerful integration into `System.Linq`-like queries
     /// on <see cref="global::System.Collections.Generic.IEnumerable{T}" /> sequences, that let you manipulate a stream of variants based on the contained type.
     /// </summary>
-    public static partial class VariantEx
+    public static partial class Variant_T_Ex
     {
         /// <summary>
         /// Transform a Variant-based enumerable sequence by applying a selector function to those elements
@@ -679,7 +679,7 @@ namespace Foo
     /// Extensions which allow for easy and powerful integration into `System.Reactive.Linq`-like queries
     /// on <see cref="global::System.IObservable{T}" /> sequences, that let you manipulate an asynchronous stream of variants based on the contained type.
     /// </summary>
-    public static partial class VariantEx
+    public static partial class Variant_T_Ex
     {
         /// <summary>
         /// Projects each <see cref="T"/> element of an observable sequence

src/dotVariant.Generator.Test/samples/Variant-generic-class.out.cs

@@ -1,4 +1,4 @@
-//
+//
 // Copyright Miro Knejp 2021.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
@@ -518,7 +518,7 @@ namespace Foo
     /// Extensions which allow for easy and powerful integration into `System.Linq`-like queries
     /// on <see cref="global::System.Collections.Generic.IEnumerable{T}" /> sequences, that let you manipulate a stream of variants based on the contained type.
     /// </summary>
-    public static partial class VariantEx
+    public static partial class Variant_T_Ex
     {
         /// <summary>
         /// Transform a Variant-based enumerable sequence by applying a selector function to those elements
@@ -679,7 +679,7 @@ namespace Foo
     /// Extensions which allow for easy and powerful integration into `System.Reactive.Linq`-like queries
     /// on <see cref="global::System.IObservable{T}" /> sequences, that let you manipulate an asynchronous stream of variants based on the contained type.
     /// </summary>
-    public static partial class VariantEx
+    public static partial class Variant_T_Ex
     {
         /// <summary>
         /// Projects each <see cref="T"/> element of an observable sequence

src/dotVariant.Generator.Test/samples/Variant-generic-multiple.out.cs

@@ -1,4 +1,4 @@
-//
+//
 // Copyright Miro Knejp 2021.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
@@ -1017,7 +1017,7 @@ namespace Foo
     /// Extensions which allow for easy and powerful integration into `System.Linq`-like queries
     /// on <see cref="global::System.Collections.Generic.IEnumerable{T}" /> sequences, that let you manipulate a stream of variants based on the contained type.
     /// </summary>
-    public static partial class VariantEx
+    public static partial class Variant_T1_T2_T3_Ex
     {
         /// <summary>
         /// Transform a Variant-based enumerable sequence by applying a selector function to those elements
@@ -1378,7 +1378,7 @@ namespace Foo
     /// Extensions which allow for easy and powerful integration into `System.Reactive.Linq`-like queries
     /// on <see cref="global::System.IObservable{T}" /> sequences, that let you manipulate an asynchronous stream of variants based on the contained type.
     /// </summary>
-    public static partial class VariantEx
+    public static partial class Variant_T1_T2_T3_Ex
     {
         /// <summary>
         /// Projects each <see cref="T1"/> element of an observable sequence

src/dotVariant.Generator.Test/samples/Variant-generic-notnull.out.cs

@@ -1,4 +1,4 @@
-//
+//
 // Copyright Miro Knejp 2021.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
@@ -518,7 +518,7 @@ namespace Foo
     /// Extensions which allow for easy and powerful integration into `System.Linq`-like queries
     /// on <see cref="global::System.Collections.Generic.IEnumerable{T}" /> sequences, that let you manipulate a stream of variants based on the contained type.
     /// </summary>
-    public static partial class VariantEx
+    public static partial class Variant_T_Ex
     {
         /// <summary>
         /// Transform a Variant-based enumerable sequence by applying a selector function to those elements
@@ -679,7 +679,7 @@ namespace Foo
     /// Extensions which allow for easy and powerful integration into `System.Reactive.Linq`-like queries
     /// on <see cref="global::System.IObservable{T}" /> sequences, that let you manipulate an asynchronous stream of variants based on the contained type.
     /// </summary>
-    public static partial class VariantEx
+    public static partial class Variant_T_Ex
     {
         /// <summary>
         /// Projects each <see cref="T"/> element of an observable sequence

src/dotVariant.Generator.Test/samples/Variant-generic-same-name.in.cs

@@ -0,0 +1,22 @@
+//
+// Copyright Miro Knejp 2021.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
+//
+
+#nullable enable
+namespace Foo
+{
+    [dotVariant.Variant]
+    public partial class Variant<T>
+    {
+        static partial void VariantOf(T value);
+    }
+
+
+    [dotVariant.Variant]
+    internal partial class Variant<T1, T2>
+    {
+        static partial void VariantOf(T1 value1, T2 value2);
+    }
+}