multi-partials (#444)

Author: HurricanKai

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Setup .NET 5.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.201
     - name: Setup .NET Core 3.1
       uses: actions/setup-dotnet@v1
       with:

.github/workflows/deploy.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.201
     - name: Setup NUKE
       run: dotnet tool install Nuke.GlobalTool --global
     - name: Push to NuGet

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.100",
-    "rollForward": "latestFeature"
+    "version": "5.0.201",
+    "rollForward": "major"
   }
 }

src/Core/Silk.NET.SilkTouch/NativeApiGenerator.cs

@@ -29,16 +29,14 @@ public void Initialize(GeneratorInitializationContext context)
 
         public void Execute(GeneratorExecutionContext context)
         {
-            MarshalBuilder marshalBuilder;
-
             if (!context.Compilation.ReferencedAssemblyNames.Any
                 (ai => ai.Name.Equals("Silk.NET.Core", StringComparison.OrdinalIgnoreCase)))
             {
                 context.ReportDiagnostic(Diagnostic.Create(Diagnostics.SilkNetCoreMissing, Location.None));
                 return;
             }
 
-            if (!(context.SyntaxReceiver is SyntaxReceiver receiver))
+            if (context.SyntaxContextReceiver is not SyntaxReceiver receiver)
                 return;
 
             var nativeApiAttribute = context.Compilation.GetTypeByMetadataName
@@ -62,7 +60,7 @@ public void Execute(GeneratorExecutionContext context)
                 (string) array[1].Value! /* first return is just the lib target */, new PInvokeNativeContextOverride());
 
 
-            marshalBuilder = new MarshalBuilder();
+            var marshalBuilder = new MarshalBuilder();
 
             // begin            |           end
             marshalBuilder.Use(Middlewares.InjectMiddleware);
@@ -79,22 +77,23 @@ public void Execute(GeneratorExecutionContext context)
             // pre load         |           post load
 
             List<ITypeSymbol> processedSymbols = new List<ITypeSymbol>();
-            
 
-            foreach (var receiverClassDeclaration in receiver.ClassDeclarations)
+
+            foreach (var group in receiver.ClassDeclarations.Select(x => (x.Item1, x.Item2, x.Item2.GetDeclaredSymbol(x.Item1)))
+                .GroupBy(x => x.Item3, SymbolEqualityComparer.Default))
             {
                 try
                 {
                     var s = ProcessClassDeclaration
                     (
-                        receiverClassDeclaration, context, nativeApiAttribute, marshalBuilder, ref processedSymbols,
-                        excludeFromOverrideAttribute
+                        group.Select(x => (x.Item1, x.Item2)), context, nativeApiAttribute, marshalBuilder, ref processedSymbols,
+                        excludeFromOverrideAttribute, (INamedTypeSymbol)group.Key
                     );
 
                     if (s is null) continue;
 
                     var name =
-                        $"{receiverClassDeclaration.Identifier.Text}.{receiverClassDeclaration.GetHashCode()}.gen";
+                        $"{group.Key.Name}.{Guid.NewGuid()}.gen";
                     context.AddSource(name, SourceText.From(s, Encoding.UTF8));
                     // File.WriteAllText(@"C:\SILK.NET\src\Lab\" + name, s);
                 }
@@ -103,48 +102,47 @@ public void Execute(GeneratorExecutionContext context)
                     context.ReportDiagnostic
                     (
                         Diagnostic.Create
-                            (Diagnostics.ProcessClassFailure, receiverClassDeclaration.GetLocation(), ex.ToString())
+                            (Diagnostics.ProcessClassFailure, group.First().Item1.GetLocation(), ex.ToString())
                     );
                 }
             }
         }
 
         private string ProcessClassDeclaration
         (
-            ClassDeclarationSyntax classDeclaration,
+            IEnumerable<(ClassDeclarationSyntax, SemanticModel)> classDeclarations,
             GeneratorExecutionContext sourceContext,
             INamedTypeSymbol nativeApiAttributeSymbol,
             MarshalBuilder rootMarshalBuilder,
             ref List<ITypeSymbol> processedSymbols,
-            INamedTypeSymbol excludeFromOverrideAttribute
+            INamedTypeSymbol excludeFromOverrideAttribute,
+            INamedTypeSymbol sharedClassSymbol
         )
         {
             var stopwatch = Stopwatch.StartNew();
             var compilation = sourceContext.Compilation;
-            if (!classDeclaration.Modifiers.Any(x => x.IsKind(SyntaxKind.PartialKeyword)))
+            if (!classDeclarations.First().Item1.Modifiers.Any(x => x.IsKind(SyntaxKind.PartialKeyword)))
                 return null;
 
-            if (!classDeclaration.Parent.IsKind(SyntaxKind.NamespaceDeclaration))
+            if (!classDeclarations.All(x => x.Item1.Parent.IsKind(SyntaxKind.NamespaceDeclaration)))
                 return null;
-            var namespaceDeclaration = (NamespaceDeclarationSyntax) classDeclaration.Parent;
+            
+            var namespaceDeclaration = (NamespaceDeclarationSyntax) classDeclarations.First().Item1.Parent;
 
             if (!namespaceDeclaration.Parent.IsKind(SyntaxKind.CompilationUnit))
                 return null;
 
             var compilationUnit = (CompilationUnitSyntax) namespaceDeclaration.Parent;
 
-            var classSymbol = ModelExtensions.GetDeclaredSymbol
-                (compilation.GetSemanticModel(classDeclaration.SyntaxTree), classDeclaration) as ITypeSymbol;
-
             if (!compilation.HasImplicitConversion
-                (classSymbol, compilation.GetTypeByMetadataName("Silk.NET.Core.Native.NativeApiContainer")))
+                (sharedClassSymbol, compilation.GetTypeByMetadataName("Silk.NET.Core.Native.NativeApiContainer")))
                 return null;
 
-            var classIsSealed = classDeclaration.Modifiers.Any(x => x.Text == "sealed");
+            var classIsSealed = classDeclarations.First().Item1.Modifiers.Any(x => x.Text == "sealed");
             var generateSeal = false;
 
             if (sourceContext.AnalyzerConfigOptions.GetOptions
-                    (classDeclaration.SyntaxTree)
+                    (classDeclarations.First().Item1.SyntaxTree)
                 .TryGetValue("silk_touch_sealed_vtable_creation", out var generateSealstr))
             {
                 if (bool.TryParse(generateSealstr, out var v))
@@ -155,7 +153,7 @@ INamedTypeSymbol excludeFromOverrideAttribute
             var generateVTable = false;
 
             if (sourceContext.AnalyzerConfigOptions.GetOptions
-                    (classDeclaration.SyntaxTree)
+                    (classDeclarations.First().Item1.SyntaxTree)
                 .TryGetValue("silk_touch_vtable_generate", out var genvtablestr))
             {
                 if (bool.TryParse(genvtablestr, out var v))
@@ -165,7 +163,7 @@ INamedTypeSymbol excludeFromOverrideAttribute
             var preloadVTable = false;
 
             if (sourceContext.AnalyzerConfigOptions.GetOptions
-                    (classDeclaration.SyntaxTree)
+                    (classDeclarations.First().Item1.SyntaxTree)
                 .TryGetValue("silk_touch_vtable_preload", out var vtablepreloadstr))
             {
                 if (bool.TryParse(vtablepreloadstr, out var v))
@@ -175,14 +173,14 @@ INamedTypeSymbol excludeFromOverrideAttribute
             var emitAssert = false;
 
             if (sourceContext.AnalyzerConfigOptions.GetOptions
-                    (classDeclaration.SyntaxTree)
+                    (classDeclarations.First().Item1.SyntaxTree)
                 .TryGetValue("silk_touch_vtable_tree_emit_assert", out var emitAssertStr))
             {
                 if (bool.TryParse(emitAssertStr, out var v))
                     emitAssert = v;
             }
 
-            var classAttribute = classSymbol.GetAttributes()
+            var classAttribute = sharedClassSymbol.GetAttributes()
                 .FirstOrDefault(x => SymbolEqualityComparer.Default.Equals(x.AttributeClass, nativeApiAttributeSymbol));
 
             var classNativeApiAttribute = classAttribute == default
@@ -198,18 +196,18 @@ INamedTypeSymbol excludeFromOverrideAttribute
             Dictionary<int, string> entryPoints = new Dictionary<int, string>();
             var processedEntrypoints = new List<EntryPoint>();
             foreach (var (declaration, symbol, entryPoint, callingConvention) in from declaration in
-                    from member in classDeclaration.Members
-                    where member.IsKind(SyntaxKind.MethodDeclaration)
-                    select (MethodDeclarationSyntax) member
-                let symbol = compilation.GetSemanticModel(declaration.SyntaxTree).GetDeclaredSymbol(declaration)
+                    from member in classDeclarations.SelectMany(x => x.Item1.Members.Select(x2 => (x2, x.Item2)))
+                    where member.x2.IsKind(SyntaxKind.MethodDeclaration)
+                    select ((MethodDeclarationSyntax) member.x2, member.Item2)
+                let symbol = declaration.Item2.GetDeclaredSymbol(declaration.Item1)
                 where symbol is not null
                 let attribute = ToNativeApiAttribute
                 (
                     symbol.GetAttributes()
                         .FirstOrDefault
                             (att => SymbolEqualityComparer.Default.Equals(att.AttributeClass, nativeApiAttributeSymbol))
                 )
-                where declaration.Modifiers.Any
+                where declaration.Item1.Modifiers.Any
                     (modifier => modifier.IsKind(SyntaxKind.PartialKeyword)) && symbol.PartialImplementationPart is null
                 let entryPoint = NativeApiAttribute.GetEntryPoint(attribute, classNativeApiAttribute, symbol.Name)
                 let callingConvention = NativeApiAttribute.GetCallingConvention(attribute, classNativeApiAttribute)
@@ -220,14 +218,14 @@ where declaration.Modifiers.Any
                 ProcessMethod
                 (
                     sourceContext, rootMarshalBuilder, callingConvention, entryPoints, entryPoint, classIsSealed,
-                    generateSeal, generateVTable, slot, compilation, symbol, declaration, newMembers,
+                    generateSeal, generateVTable, slot, compilation, symbol, declaration.Item1, newMembers,
                     ref gcCount, processedEntrypoints, generatedVTableName
                 );
             }
 
             if (slotCount > 0)
             {
-                if (!processedSymbols.Contains(classSymbol))
+                if (!processedSymbols.Contains(sharedClassSymbol))
                 {
                     newMembers.Add
                     (
@@ -283,7 +281,7 @@ where declaration.Modifiers.Any
                     );
                 }
 
-                processedSymbols.Add(classSymbol);
+                processedSymbols.Add(sharedClassSymbol);
             }
 
             if (newMembers.Count == 0)
@@ -330,21 +328,21 @@ where declaration.Modifiers.Any
                 );
             }
 
-            ProcessNativeContextOverrides(processedEntrypoints.ToArray(), ref newMembers, classSymbol, classDeclaration, sourceContext.Compilation, excludeFromOverrideAttribute);
-
+            ProcessNativeContextOverrides(processedEntrypoints.ToArray(), ref newMembers, sharedClassSymbol, excludeFromOverrideAttribute);
+            
             var newNamespace = namespaceDeclaration.WithMembers
                 (
                     List
                     (
                         new MemberDeclarationSyntax[]
                         {
-                            classDeclaration.WithMembers
+                            classDeclarations.First().Item1.WithMembers
                                 (List(newMembers))
                             .WithAttributeLists(List<AttributeListSyntax>())
                         }
                     )
                 )
-                .WithUsings(compilationUnit.Usings);
+                .WithUsings(compilationUnit.Usings.Add(UsingDirective(IdentifierName("Silk.NET.Core.Native"))).Add(UsingDirective(IdentifierName("Silk.NET.Core.Contexts"))));
 
             var result = newNamespace.NormalizeWhitespace().ToFullString();
             stopwatch.Stop();
@@ -358,7 +356,7 @@ where declaration.Modifiers.Any
                 (
                     Diagnostic.Create
                     (
-                        Diagnostics.BuildInfo, classDeclaration.GetLocation(), slotCount, gcCount,
+                        Diagnostics.BuildInfo, classDeclarations.First().Item1.GetLocation(), slotCount, gcCount,
                         stopwatch.ElapsedMilliseconds + "ms"
                     )
                 );

src/Core/Silk.NET.SilkTouch/NativeContextOverrideGeneration.cs

@@ -17,15 +17,13 @@ public partial class NativeApiGenerator
     {
         private Dictionary<INamedTypeSymbol, Func<ImmutableArray<TypedConstant>, (int, string, INativeContextOverride)?>>
             _nativeContextAttributes =
-                new Dictionary<INamedTypeSymbol, Func<ImmutableArray<TypedConstant>, (int, string, INativeContextOverride)?>>();
+                new(SymbolEqualityComparer.Default);
 
         private void ProcessNativeContextOverrides
         (
             EntryPoint[] entrypoints,
             ref List<MemberDeclarationSyntax> members,
             ITypeSymbol classSymbol,
-            ClassDeclarationSyntax classDeclaration,
-            Compilation compilation,
             INamedTypeSymbol excludeFromOverrideAttribute
         )
         {

src/Core/Silk.NET.SilkTouch/Silk.NET.SilkTouch.csproj

@@ -18,8 +18,8 @@
       <Compile Include="..\Silk.NET.Core\Attributes\UnmanagedTypeAttribute.cs" />
       <Compile Include="..\Silk.NET.Core\Attributes\InjectAttribute.cs" />
 
-      <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-3.final" PrivateAssets="all" />
-      <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0" PrivateAssets="all" />
+      <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.9.0" PrivateAssets="all" />
+      <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
 
       <!-- Package the generator in the analyzer directory of the nuget package -->
       <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />

src/Core/Silk.NET.SilkTouch/SyntaxReceiver.cs

@@ -9,13 +9,16 @@ namespace Silk.NET.SilkTouch
 {
     public partial class NativeApiGenerator
     {
-        public class SyntaxReceiver : ISyntaxReceiver
+        public class SyntaxReceiver : ISyntaxContextReceiver
         {
-            public List<ClassDeclarationSyntax> ClassDeclarations = new List<ClassDeclarationSyntax>();
-            
-            public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
+            public List<(ClassDeclarationSyntax, SemanticModel)> ClassDeclarations = new();
+
+            public void OnVisitSyntaxNode(GeneratorSyntaxContext context)
             {
-                if (syntaxNode is ClassDeclarationSyntax cds) ClassDeclarations.Add(cds);
+                if (context.Node is ClassDeclarationSyntax cds)
+                {
+                    ClassDeclarations.Add((cds, context.SemanticModel));
+                }
             }
         }
     }

src/Lab/TestLib/Class1.cs renamed to src/Lab/TestLib/TestClass2-1.cs

@@ -6,7 +6,6 @@
 using Silk.NET.Core.Attributes;
 using Silk.NET.Core.Contexts;
 using Silk.NET.Core.Native;
-using UnmanagedType = Silk.NET.Core.Native.UnmanagedType;
 
 namespace TestLib
 {
@@ -25,10 +24,6 @@ public partial class TestClass2 : NativeApiContainer
         [NativeApi(EntryPoint = "MessageBoxA")]
         public partial int MessageBox(nint hwnd, string text, string caption, uint buttons);
 
-        [NativeApi(EntryPoint = "MessageBoxA")]
-        public partial int MessageBox(nint hwnd, string text, string caption,
-            [UnmanagedType(UnmanagedType.U4)] bool buttons);
-        
         [NativeApi(EntryPoint = "MessageBoxA")]
         public partial int MessageBox(nint hwnd, string text, Span<char> caption, uint buttons);
 

src/Lab/TestLib/TestClass2-2.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Silk.NET.Core.Attributes;
+using Silk.NET.Core.Native;
+
+namespace TestLib
+{
+    partial class TestClass2
+    {
+        [NativeApi(EntryPoint = "MessageBoxA")]
+        public partial int MessageBox(nint hwnd, string text, string caption,
+            [UnmanagedType(UnmanagedType.U4)] bool buttons);
+    }
+}

src/Lab/TestLib/TestClass2-3.cs

@@ -0,0 +1,9 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace TestLib
+{
+    partial class TestClass2
+    {
+    }
+}