Ensure that we null out the stream for generate-multi-file for all helper class generation methods.

teo-tsirpanis · teo-tsirpanis · commit 5a035f689e02 · 2023-03-02T13:14:17.000+02:00
This is an extension of dotnet#393. Fixes dotnet#413.
diff --git a/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs b/sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs
@@ -435,6 +435,11 @@ static void GenerateNativeInheritanceAttribute(PInvokeGenerator generator, Strea
             {
                 sw.WriteLine('}');
             }
+
+            if (!leaveStreamOpen)
+            {
+                stream = null;
+            }
         }
 
         static void GenerateNativeTypeNameAttribute(PInvokeGenerator generator, Stream? stream, bool leaveStreamOpen)
@@ -513,6 +518,11 @@ static void GenerateNativeTypeNameAttribute(PInvokeGenerator generator, Stream?
             {
                 sw.WriteLine('}');
             }
+
+            if (!leaveStreamOpen)
+            {
+                stream = null;
+            }
         }
 
         static void GenerateSetsLastSystemErrorAttribute(PInvokeGenerator generator, Stream? stream, bool leaveStreamOpen)
@@ -581,6 +591,11 @@ static void GenerateSetsLastSystemErrorAttribute(PInvokeGenerator generator, Str
             {
                 sw.WriteLine('}');
             }
+
+            if (!leaveStreamOpen)
+            {
+                stream = null;
+            }
         }
 
         static void GenerateVtblIndexAttribute(PInvokeGenerator generator, Stream? stream, bool leaveStreamOpen)
@@ -660,6 +675,11 @@ static void GenerateVtblIndexAttribute(PInvokeGenerator generator, Stream? strea
             {
                 sw.WriteLine('}');
             }
+
+            if (!leaveStreamOpen)
+            {
+                stream = null;
+            }
         }
 
         static void GenerateTransparentStructs(PInvokeGenerator generator, Stream? stream, bool leaveStreamOpen)

Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,11 @@ static void GenerateNativeInheritanceAttribute(PInvokeGenerator generator, Strea`
`435`	`435`	`{`
`436`	`436`	`sw.WriteLine('}');`
`437`	`437`	`}`
	`438`	`+`
	`439`	`+ if (!leaveStreamOpen)`
	`440`	`+ {`
	`441`	`+ stream = null;`
	`442`	`+ }`
`438`	`443`	`}`
`439`	`444`
`440`	`445`	`static void GenerateNativeTypeNameAttribute(PInvokeGenerator generator, Stream? stream, bool leaveStreamOpen)`
`@@ -513,6 +518,11 @@ static void GenerateNativeTypeNameAttribute(PInvokeGenerator generator, Stream?`
`513`	`518`	`{`
`514`	`519`	`sw.WriteLine('}');`
`515`	`520`	`}`
	`521`	`+`
	`522`	`+ if (!leaveStreamOpen)`
	`523`	`+ {`
	`524`	`+ stream = null;`
	`525`	`+ }`
`516`	`526`	`}`
`517`	`527`
`518`	`528`	`static void GenerateSetsLastSystemErrorAttribute(PInvokeGenerator generator, Stream? stream, bool leaveStreamOpen)`
`@@ -581,6 +591,11 @@ static void GenerateSetsLastSystemErrorAttribute(PInvokeGenerator generator, Str`
`581`	`591`	`{`
`582`	`592`	`sw.WriteLine('}');`
`583`	`593`	`}`
	`594`	`+`
	`595`	`+ if (!leaveStreamOpen)`
	`596`	`+ {`
	`597`	`+ stream = null;`
	`598`	`+ }`
`584`	`599`	`}`
`585`	`600`
`586`	`601`	`static void GenerateVtblIndexAttribute(PInvokeGenerator generator, Stream? stream, bool leaveStreamOpen)`
`@@ -660,6 +675,11 @@ static void GenerateVtblIndexAttribute(PInvokeGenerator generator, Stream? strea`
`660`	`675`	`{`
`661`	`676`	`sw.WriteLine('}');`
`662`	`677`	`}`
	`678`	`+`
	`679`	`+ if (!leaveStreamOpen)`
	`680`	`+ {`
	`681`	`+ stream = null;`
	`682`	`+ }`
`663`	`683`	`}`
`664`	`684`
`665`	`685`	`static void GenerateTransparentStructs(PInvokeGenerator generator, Stream? stream, bool leaveStreamOpen)`