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

Format trailing-whitespaces and end-of-file with pre-commit #2204

Merged
merged 2 commits into from May 28, 2024

Conversation

Avasam
Copy link
Collaborator

@Avasam Avasam commented Mar 14, 2024

Follow-up to #2034 for trailing whitespace changes. Merging #2222 would reduce changes here. You can hide whitespace changes to make the review easier.
These files would all be automatically formatted with pre-commit.ci.

Due to the nature of this PR containing a .git-blame-ignore-revs entry, please do not squash-merge, I'll keep the history of this PR a clean 2 commits.

@vernondcole the adodbapi changes should be quite easy to approve as it only contains trailing whitespace changes.

@@ -39,5 +36,8 @@ repos:
- id: black
verbose: true

# Vendored
exclude: ^com/win32comext/mapi/src/mapi_headers/.*$
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I've kept com/win32comext/mapi/src/mapi_headers ignored, but I really feel like when it comes to formatters (not linters/autofixers!), we could still apply them to vendored code. Especially given that it should be automatically formatted once https://pre-commit.ci/ is connected to this repo.
It's already the case with Black where it's run indiscriminately on the entire repo.

Copy link
Owner

Choose a reason for hiding this comment

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

In general I disagree - the "cost" of doing this is that it makes it more difficult to check the provenance of the file (ie, "is this the same file from SDK version a.b.c?" becomes far more difficult to answer). The benefits from auto-formatting (that when editing a file there's no ambiguity about what the new code should look like) doesn't apply as we don't expect the files to be edited - indeed, we expect git log for the file to list only the time it was vendored and any other changes are likely to be in error. For these MAPI files, I really can't see a single benefit to formatting them.

I can see how the case can be made to autoformat code we've "forked" though - there generally is an expectation of editing those files. Certainly if we had "vendored" python code I would have asked for black to exclude them. The closest we have to that in this repo are those "idle" files, which I consider forked.

Copy link
Owner

Choose a reason for hiding this comment

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

Relatedly, I consider Scintilla "vendored" too so only see downsides and no upsides to auto-formatting that.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I understand your point, that is not something I had considered (or I had forgotten about), as well as the semantic differences between "vendored" and "forked".

Copy link
Collaborator Author

@Avasam Avasam Mar 14, 2024

Choose a reason for hiding this comment

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

What about SWIG and AutoDuck?

@Avasam Avasam force-pushed the trailing-whitespaces-&-EOF branch from 9af87c9 to 0116357 Compare March 14, 2024 18:57
@Avasam Avasam force-pushed the trailing-whitespaces-&-EOF branch from 0116357 to b126854 Compare April 4, 2024 19:05
@Avasam Avasam marked this pull request as draft April 11, 2024 17:22
@Avasam Avasam marked this pull request as ready for review May 10, 2024 03:34
@Avasam Avasam requested a review from vernondcole May 10, 2024 03:35
@Avasam Avasam force-pushed the trailing-whitespaces-&-EOF branch from 4411d06 to 28708c0 Compare May 28, 2024 13:57
@Avasam Avasam merged commit 1f5358a into mhammond:main May 28, 2024
1 of 27 checks passed
@Avasam Avasam deleted the trailing-whitespaces-&-EOF branch May 28, 2024 13: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.

None yet

2 participants