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

Prettify #295

Merged
merged 1 commit into from
Jan 7, 2024
Merged

Prettify #295

merged 1 commit into from
Jan 7, 2024

Conversation

sbryngelson
Copy link
Member

Prettify with CI. Uses https://gist.github.com/sbryngelson/3ddb58aa50806c0bd2c806d49bfc99ff.

Closed #282 in favor of this due to some version control nonsense.

@henryleberre
Copy link
Member

@sbryngelson I took the liberty to tweak a few things. Let me know what you think. The main points are that ./mfc.sh format diff in its current form couldn't print a diff of what would be formatted and couldn't check the diff with the addition of the new ACC indentation script. I kept ./mfc.sh format and opted to check the diff with git diff --exit-code in CI.

In order to properly introduce ./mfc.sh format diff, we would have run both fprettify and your indenter.py in a separate directory, and finally diff the two folders.

Also, it looks like when I ran ./mfc.sh format some new things popped up. I am not sure why. They look like regressions.

@sbryngelson
Copy link
Member Author

@sbryngelson I took the liberty to tweak a few things. Let me know what you think. The main points are that ./mfc.sh format diff in its current form couldn't print a diff of what would be formatted and couldn't check the diff with the addition of the new ACC indentation script. I kept ./mfc.sh format and opted to check the diff with git diff --exit-code in CI.

In order to properly introduce ./mfc.sh format diff, we would have run both fprettify and your indenter.py in a separate directory, and finally diff the two folders.

Thanks. Yes I realized this shortcoming with diff but decided that it was sufficiently good. Thanks for improving it.

Also, it looks like when I ran ./mfc.sh format some new things popped up. I am not sure why. They look like regressions.

I don't know what you're referring to

@henryleberre
Copy link
Member

I don't know what you're referring to

If you take a look at 6c3dd9e, there are some regressions in directive indentation.

@sbryngelson
Copy link
Member Author

sbryngelson commented Jan 6, 2024

fixed this via some additions to the formatting script. @henryleberre feel free to review and merge when ready

Co-authored-by: Henry LE BERRE <[email protected]>
@henryleberre henryleberre merged commit 4833971 into master Jan 7, 2024
5 of 35 checks passed
@henryleberre henryleberre deleted the pretty-2 branch January 7, 2024 05:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants