Fix alignment of strings with preprocessor concatenations #3723
Conversation
This file contains 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
ArnauBigas
requested review from
gmaurel,
mwoehlke-kitware and
micheleCTDEAdmin
as code owners
|
@guy-maurel |
micheleCTDE
requested changes
Jul 1, 2022
| { | ||
| Chunk *tmp = prev; | ||
|
|
||
| while ( tmp->prev |
There was a problem hiding this comment.
you should use "GetPrev()" instead of "prev", which also takes away the need for the first check in the while loop.
|
By the way, welcome to uncrustify, good effort! |
|
a fine work. |
micheleCTDE
reviewed
Jul 2, 2022
| Chunk *tmp = prev; | ||
|
|
||
| while ( tmp->prev | ||
| && (tmp->prev->Is(CT_WORD) || tmp->prev->Is(CT_STRING))) |
There was a problem hiding this comment.
please also break and indent the while condition as per current style.
this has been done, no regressions 😄 |
gmaurel
approved these changes
Jul 20, 2022
|
@ArnauBigas |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #3086
As described in the related issue, the alignment of strings in a new line after a string which is concatenated by the C/C++ preprocessor is unintuitive in the current version of the code. This PR addresses that by aligning the string in the new line to the start of the string of the previous line, taking into account the possible concatenations, making the indentation/alignment much more intuitive.