Astyle indent preproc block#1007
Merged
fpistm merged 2 commits intostm32duino:masterfrom Mar 31, 2020
Merged
Conversation
Member
|
To have it passed, could you rebase on top of the master, please? |
Member
|
Looking at all changes, I will have to update my scripts to generate wrapper files and PinNamesVar.h to indent properly by default. |
matthijskooijman
force-pushed
the
astyle-indent-preproc-block
branch
from
7295118 to
eb6817c
Compare
Contributor
Author
|
I pushed one more commit to let astyle enforce linux-style line endings. I noticed some CRLF-style files in the jumpsysBL branch, but when adding this option, notice @fpistm had already unified these in master. This just encodes this in the astyle config as well. |
fpistm
requested changes
Mar 30, 2020
matthijskooijman
force-pushed
the
astyle-indent-preproc-block
branch
from
aef4a33 to
eb6817c
Compare
This indents preprocessor blocks, making nested preprocessor blocks easier to read.
This runs `python3 CI/astyle/astyle.py` and commits the result.
matthijskooijman
force-pushed
the
astyle-indent-preproc-block
branch
from
eb6817c to
4ab0fc3
Compare
Contributor
Author
|
What shall we do with this PR? I've just rebased it on top of master again, maybe it could just be merged? There's still a few open PRs that would produce conflicts from this, but most of them are experimental and would need to be mostly redone anyway, I think? |
fpistm
approved these changes
Mar 31, 2020
fpistm
added a commit
to stm32duino/Arduino_Tools
that referenced
this pull request
Apr 1, 2020
See: stm32duino/Arduino_Core_STM32#1007 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
fpistm
added a commit
to stm32duino/Arduino_Tools
that referenced
this pull request
May 4, 2020
See: stm32duino/Arduino_Core_STM32#1007 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Based on #1006, I quickly tried enabling the astyle ident-preproc-block to see what the impact would be. It produces a rather big diff, but on first glance does improve readability a lot.
Because it changes so much, this would probably mess with open pullrequests, so it might be good to merge those as far as possible (it is probably also possible to update them semi-automatically, but might still be a bit messy).