Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge FileScopedNamespaces to main #54724

Merged
merged 25 commits into from
Jul 9, 2021
Merged

Conversation

RikkiGibson
Copy link
Contributor

Test plan: #49000

msftbot[bot] and others added 25 commits February 28, 2021 01:41
…copedNamespaces

Merge master to features/FileScopedNamespaces
…pedNamespaces

Merge main to features/FileScopedNamespaces
…pedNamespaces

Merge main to features/FileScopedNamespaces
…pedNamespaces

Merge main to features/FileScopedNamespaces
…pedNamespaces

Merge main to features/FileScopedNamespaces
…pedNamespaces

Merge main to features/FileScopedNamespaces
…pedNamespaces

Merge main to features/FileScopedNamespaces
Merge main into FileScopedNamespaces
Co-authored-by: Rikki Gibson <rigibson@microsoft.com>
…lyn into merges/main-to-features/FileScopedNamespaces
…pedNamespaces

Merges/main to features/file scoped namespaces
… into merges/main-to-features/FileScopedNamespaces
… into merges/main-to-features/FileScopedNamespaces
Address FileScopedNamespaces test plan review
@@ -773,7 +773,7 @@ public bool IsMethodLevelMember([NotNullWhen(true)] SyntaxNode? node)

public bool IsTopLevelNodeWithMembers([NotNullWhen(true)] SyntaxNode? node)
{
return node is NamespaceDeclarationSyntax ||
return node is BaseNamespaceDeclarationSyntax ||
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CyrusNajmabadi There are other references to NamespaceDeclarationSyntax in this class, some of which I feel they should be adjusted to handle file-scoped namespaces. Are you tracking doing that?

@RikkiGibson RikkiGibson merged commit 5ccc528 into main Jul 9, 2021
@ghost ghost added this to the Next milestone Jul 9, 2021
@RikkiGibson RikkiGibson deleted the features/FileScopedNamespaces branch July 9, 2021 23:53
@allisonchou allisonchou modified the milestones: Next, 17.0.P3 Jul 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants