-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[ASTGen] NFC: Format with swift-format #69325
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
Conversation
This uses the same formatting configuration as sourcekit-lsp.
@swift-ci please smoke test |
@@ -0,0 +1,17 @@ | |||
{ | |||
"version": 1, | |||
"lineLength": 120, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI we settled on aiming for 160 here, which motivated swiftlang/swift-syntax#1714.
How about a symlink to the swift-syntax configuration file for everything inside lib
instead? Consistent formatting across our Swift repos sounds really nice.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll let @ahoppen confirm, but AFAIK we want to standardize on 120 swiftlang/sourcekit-lsp#890 (comment)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
but AFAIK we want to standardize on 120
Oh, that’s new. Totally fine by me! I still incline to a symlink until swift-syntax transitions though. I’m wondering what we can do to standardize the Swift formatting in these repositories without having to maintain multiple config files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we agreed to use 120 columns. We should update swift-syntax to 120 as well at some point but I haven’t gotten to it yet.
I still incline to a symlink until swift-syntax transitions though
If we were to symlink swift-syntax’s config file to swift, it means that you can’t work on swift-syntax as a standalone package anymore. Similar for sourcekit-lsp. I think the best thing to do, is to have a separate config file in each repo and add a CI check that all the config files are the same.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we were to symlink swift-syntax’s config file to swift, it means that you can’t work on swift-syntax as a standalone package anymore.
I meant the symlink to be in the swift repository and link to the swift-syntax or sourcekit-lsp config file.
I think the best thing to do, is to have a separate config file in each repo and add a CI check that all the config files are the same.
Alternatively, maybe we could create a special repo to host this kind of stuff and add it as a git submodule to other repos. Then each repo can replace their own config files with symlinks to the config files in that submodule.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I’ve got a few places where I think that swift-format’s default line wrapping behavior can be improved but I’m fine with adjusting them in a follow-up PR if you want to merge this to unblock other PRs.
@@ -0,0 +1,17 @@ | |||
{ | |||
"version": 1, | |||
"lineLength": 120, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we agreed to use 120 columns. We should update swift-syntax to 120 as well at some point but I haven’t gotten to it yet.
I still incline to a symlink until swift-syntax transitions though
If we were to symlink swift-syntax’s config file to swift, it means that you can’t work on swift-syntax as a standalone package anymore. Similar for sourcekit-lsp. I think the best thing to do, is to have a separate config file in each repo and add a CI check that all the config files are the same.
Merging so I can base #69326 on main, will do a follow-up for the formatting fixups |
Opened #69336 for the formatting tweaks |
This uses the same formatting configuration as sourcekit-lsp.