Skip to content

Spelling utils #42458

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 34 commits into from
Sep 20, 2022
Merged

Spelling utils #42458

merged 34 commits into from
Sep 20, 2022

Conversation

jsoref
Copy link
Contributor

@jsoref jsoref commented Apr 19, 2022

This fixes some misspellings in Swift utils, it is split per #42421 (comment)

@tshortli
Copy link
Contributor

@swift-ci please test

@tshortli
Copy link
Contributor

ImportError: cannot import name 'TRIVIAS' from 'gyb_syntax_support.Trivia' (/Users/ec2-user/jenkins/workspace/swift-PR-macos/branch-main/swift/utils/gyb_syntax_support/Trivia.py)

@tshortli
Copy link
Contributor

Thanks for this PR! The build failure appears to be related to the trivias -> trivia change. I skimmed over all of the changes and that was the only one I wasn't sure whether we should make. I think the authors of the code using "trivias" likely wanted to disambiguate collections from variables representing singular trivia for clarity in the code, so even though it's not a valid pluralization it may still be desirable. I don't work on the parser, though, so I'll add some reviewers who may be able to weigh in on that.

@jsoref
Copy link
Contributor Author

jsoref commented Apr 20, 2022

Right, I should have tagged that here. I think I called it out in the parent PR.

It's easy to drop the change, or to pull in the piece that was clipped by the directory split.

I won't be able to do either until tonight, but hopefully I'll have direction from a reviewer by then.

@tshortli
Copy link
Contributor

Right, I should have tagged that here. I think I called it out in the parent PR.

It's easy to drop the change, or to pull in the piece that was clipped by the directory split.

I won't be able to do either until tonight, but hopefully I'll have direction from a reviewer by then.

I think the most straightforward thing to do here is drop the trivia change from this PR. Everything else looks good to me.

@rintaro
Copy link
Member

rintaro commented Apr 21, 2022

TRIVIAS change requires a synchronous change in swift-syntax repo. I would prefer to drop the change from this PR.

As for the TRIVIAS, I don't have a strong opinion. Though, as a non-native English speaker, it doesn't look strange, and the presence of S is helpful to indicate that it is a collection. But I don't know how native speakers feel. Paging @ahoppen

@tshortli
Copy link
Contributor

@swift-ci please test

@CodaFi
Copy link
Contributor

CodaFi commented Apr 21, 2022

@swift-ci python lint

Copy link
Member

@ahoppen ahoppen left a comment

Choose a reason for hiding this comment

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

Thanks a lot for this PR. There are way more spelling errors than I expected. Fixing them is great. 🙏

I reviewed the changes in gyb_syntax_support, incrparse and parser-lib and added a few inline comments.

@jsoref jsoref force-pushed the spelling-utils branch 4 times, most recently from 20e8f86 to 7e7e30e Compare April 24, 2022 02:10
@jsoref jsoref mentioned this pull request Apr 24, 2022
@tshortli
Copy link
Contributor

@swift-ci please test

@tshortli
Copy link
Contributor

@jsoref looks good, just needs a conflict resolution before this can land

@ahoppen
Copy link
Member

ahoppen commented Apr 29, 2022

@swift-ci Please smoke test

Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Copy link
Member

@ahoppen ahoppen left a comment

Choose a reason for hiding this comment

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

Changes in incrparse look good to me – I didn’t review the other changes.

@tshortli
Copy link
Contributor

@swift-ci please smoke test

@tshortli tshortli merged commit 238270f into swiftlang:main Sep 20, 2022
@jsoref jsoref deleted the spelling-utils branch September 20, 2022 16:35
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.

5 participants