Skip to content

Fix child name validation failures in testSingleTokenChoiceChildNaming #1854

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

Merged
merged 1 commit into from
Jun 27, 2023

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Jun 27, 2023

Fixes the naming validation found by the testSingleTokenChoiceChildNaming test, which is describes as follows:

Checks standardized naming of children with a single token choice

  • If a child has a single keyword as its choice, it should be named *Keyword (e.g. ImportKeyword)
  • If it’s another token kind, name it the same as the the token choice (e.g. LeftParen)

I will be opening more PRs like to fix naming inconsistencies over in the next couple of weeks.

@ahoppen ahoppen requested a review from bnbarham June 27, 2023 07:48
@ahoppen ahoppen requested a review from DougGregor as a code owner June 27, 2023 07:48
@ahoppen
Copy link
Member Author

ahoppen commented Jun 27, 2023

@swift-ci Please test

Copy link
Contributor

@kimdv kimdv left a comment

Choose a reason for hiding this comment

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

🤩

Comment on lines -160 to +161
name: "Label",
name: "AvailabilityLabel",
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need a deprecatedName here`

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, yes. Thanks for catching it.

@ahoppen ahoppen force-pushed the ahoppen/naming-inconsistencies branch from 4149759 to 82e380c Compare June 27, 2023 11:20
@ahoppen
Copy link
Member Author

ahoppen commented Jun 27, 2023

@swift-ci Please test

@ahoppen
Copy link
Member Author

ahoppen commented Jun 27, 2023

@swift-ci Please test Windows

1 similar comment
@ahoppen
Copy link
Member Author

ahoppen commented Jun 27, 2023

@swift-ci Please test Windows

@ahoppen
Copy link
Member Author

ahoppen commented Jun 27, 2023

@swift-ci Please test macOS

@ahoppen ahoppen merged commit fa0e5c9 into swiftlang:main Jun 27, 2023
@ahoppen ahoppen deleted the ahoppen/naming-inconsistencies branch June 27, 2023 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants