Ensure empty test files aren't emitted

Author: tannergooding

ClangSharp.sln

@@ -58,6 +58,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{2F80
 		scripts\build.sh = scripts\build.sh
 		scripts\cibuild.cmd = scripts\cibuild.cmd
 		scripts\cibuild.sh = scripts\cibuild.sh
+		scripts\SignClientFileList.txt = scripts\SignClientFileList.txt
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "packages", "packages", "{AE6CF12F-5CC3-463B-A74B-6CCAE26EE4EF}"

sources/ClangSharp.Interop/clang.cs

@@ -3,8 +3,11 @@
 using System;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
+[assembly: DisableRuntimeMarshalling]
+
 namespace ClangSharp.Interop;
 
 public static unsafe partial class @clang

sources/ClangSharp.Interop/clangsharp/clangsharp.cs

@@ -6,7 +6,7 @@
 
 namespace ClangSharp.Interop;
 
-public static partial class clangsharp
+public static partial class @clangsharp
 {
     [DllImport("libClangSharp", CallingConvention = CallingConvention.Cdecl, EntryPoint = "clangsharp_Cursor_getArgument", ExactSpelling = true)]
     public static extern CXCursor Cursor_getArgument(CXCursor C, [NativeTypeName("unsigned int")] uint i);

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs

@@ -1357,20 +1357,7 @@ private void VisitRecordDecl(RecordDecl recordDecl)
 
             var isTopLevelStruct = _config.WithTypes.TryGetValue(name, out var withType) && withType.Equals("struct", StringComparison.Ordinal);
             var generateTestsClass = !recordDecl.IsAnonymousStructOrUnion && recordDecl.DeclContext is not RecordDecl;
-
-            if ((_testOutputBuilder is not null) && generateTestsClass && !isTopLevelStruct)
-            {
-                _testOutputBuilder.WriteIndented("/// <summary>Provides validation of the <see cref=\"");
-                _testOutputBuilder.Write(escapedName);
-                _testOutputBuilder.WriteLine("\" /> struct.</summary>");
-
-                WithAttributes(recordDecl, onlySupportedOSPlatform: true, isTestOutput: true);
-
-                _testOutputBuilder.WriteIndented("public static unsafe partial class ");
-                _testOutputBuilder.Write(escapedName);
-                _testOutputBuilder.WriteLine("Tests");
-                _testOutputBuilder.WriteBlockStart();
-            }
+            var testOutputStarted = false;
 
             var nullableUuid = (Guid?)null;
             var uuidName = "";
@@ -1384,6 +1371,8 @@ private void VisitRecordDecl(RecordDecl recordDecl)
 
                 if ((_testOutputBuilder is not null) && (uuid != Guid.Empty))
                 {
+                    StartTestOutput(ref testOutputStarted, generateTestsClass, isTopLevelStruct);
+
                     var className = GetClass(uuidName);
 
                     _testOutputBuilder.AddUsingDirective("System");
@@ -1676,6 +1665,8 @@ private void VisitRecordDecl(RecordDecl recordDecl)
 
             if ((_testOutputBuilder is not null) && generateTestsClass && !_config.GenerateDisableRuntimeMarshalling)
             {
+                StartTestOutput(ref testOutputStarted, generateTestsClass, isTopLevelStruct);
+
                 _testOutputBuilder.WriteIndented("/// <summary>Validates that the <see cref=\"");
                 _testOutputBuilder.Write(escapedName);
                 _testOutputBuilder.WriteLine("\" /> struct is blittable.</summary>");
@@ -1857,7 +1848,7 @@ private void VisitRecordDecl(RecordDecl recordDecl)
             {
                 _outputBuilder.EndStruct(in desc);
 
-                if ((_testOutputBuilder is not null) && generateTestsClass)
+                if ((_testOutputBuilder is not null) && generateTestsClass && testOutputStarted)
                 {
                     _testOutputBuilder.WriteBlockEnd();
                 }
@@ -3125,6 +3116,25 @@ void VisitConstantOrIncompleteArrayFieldDecl(RecordDecl recordDecl, FieldDecl co
 
             _outputBuilder.EndStruct(in desc);
         }
+
+        void StartTestOutput(ref bool testOutputStarted, bool generateTestsClass, bool isTopLevelStruct)
+        {
+            if ((_testOutputBuilder is not null) && generateTestsClass && !isTopLevelStruct && !testOutputStarted)
+            {
+                _testOutputBuilder.WriteIndented("/// <summary>Provides validation of the <see cref=\"");
+                _testOutputBuilder.Write(escapedName);
+                _testOutputBuilder.WriteLine("\" /> struct.</summary>");
+
+                WithAttributes(recordDecl, onlySupportedOSPlatform: true, isTestOutput: true);
+
+                _testOutputBuilder.WriteIndented("public static unsafe partial class ");
+                _testOutputBuilder.Write(escapedName);
+                _testOutputBuilder.WriteLine("Tests");
+                _testOutputBuilder.WriteBlockStart();
+
+                testOutputStarted = true;
+            }
+        }
     }
 
     private void VisitTranslationUnitDecl(TranslationUnitDecl translationUnitDecl)

sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs

@@ -323,6 +323,21 @@ public void Close()
             var outputPath = outputBuilder.IsTestOutput ? _config.TestOutputLocation : _config.OutputLocation;
             var isMethodClass = _topLevelClassNames.Contains(outputBuilder.Name);
 
+            if (outputBuilder is CSharpOutputBuilder csharpOutputBuilder)
+            {
+                if (!csharpOutputBuilder.Contents.Any())
+                {
+                    continue;
+                }
+            }
+            else if (outputBuilder is XmlOutputBuilder xmlOutputBuilder)
+            {
+                if (!xmlOutputBuilder.Contents.Any())
+                {
+                    continue;
+                }
+            }
+
             if (_config.GenerateMultipleFiles)
             {
                 outputPath = Path.Combine(outputPath, $"{outputBuilder.Name}{outputBuilder.Extension}");
@@ -1894,7 +1909,7 @@ private void CloseOutputBuilder(Stream stream, IOutputBuilder outputBuilder, boo
                     sw.WriteLine();
                 }
             }
-            else if ((outputBuilder is XmlOutputBuilder xmlOutputBuilder) && xmlOutputBuilder.Contents.Any())
+            else if (outputBuilder is XmlOutputBuilder xmlOutputBuilder)
             {
                 sw.WriteLine("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>");
                 sw.WriteLine("<bindings>");