Don't emit a namespace closing brace for file-scoped namespaces in single-file output#729
Merged
tannergooding merged 1 commit intoJul 13, 2026
Conversation
…ngle-file output When generating a single output file, the namespace closing brace was written unconditionally after all output builders. File-scoped namespaces emit no opening brace, so this produced a stray trailing brace and invalid C#. Skip the closing brace (for both the primary and test streams) when file-scoped namespaces are used. Fixes dotnet#555 Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #555.
When generating a single output file with
generate-file-scoped-namespaces, the output ended with a stray closing brace:File-scoped namespaces emit no opening
{, butCloseOutputBuilder's single-file finalization inPInvokeGenerator.Close.cswrote the namespace closing}unconditionally after all output builders (every other close path already guards on!GenerateFileScopedNamespaces). Guard the primary and test-stream braces the same way.Block-scoped output is unchanged (verified: the
{/}pair still balances), and no golden output changed.Added
FileScopedNamespaceTestwith two cases — a method-class function (the reported scenario) and a struct — exercising both single-file close paths. Build0 warning / 0 error; full suite green (3715 passed / 0 failed).Note
This PR description and the code change were drafted by Copilot on my behalf.
Follow-up (out of scope): when a method-class is emitted after a non-method-class type in the same file-scoped single file, the method-class body is over-indented by one level. Tracking separately.