Merge pull request #293 from tannergooding/main

Ensure that top level classes/structs correctly mark themselves as unsafe and include the right namespace for tests
dotnet · Nov 15, 2021 · 37f7e1d · 37f7e1d
2 parents 0f2b740 + 86431b4
commit 37f7e1d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
@@ -1300,6 +1300,11 @@ private void VisitRecordDecl(RecordDecl recordDecl)
                     {
                         _topLevelClassUsings[name] = withUsings;
                     }
+
+                    if (desc.IsUnsafe)
+                    {
+                        _isTopLevelClassUnsafe[name] = true;
+                    }
                 }
 
                 if (hasVtbl)

diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs
@@ -4991,7 +4991,9 @@ void CreateTestOutputBuilder(string name)
             {
                 _testOutputBuilder = _outputBuilderFactory.CreateTests(name);
 
-                if (!_topLevelClassNames.Contains(name))
+                var isTopLevelStruct = _config.WithTypes.TryGetValue(name, out var withType) && (withType == "struct");
+
+                if (!_topLevelClassNames.Contains(name) || isTopLevelStruct)
                 {
                     _testOutputBuilder.AddUsingDirective("System.Runtime.InteropServices");
                 }