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

recalculate the level after #endif #3384

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

guy-maurel
Copy link
Contributor

fixes #3336

@guy-maurel
Copy link
Contributor Author

@micheleCTDE Could you please make your big test?

@micheleCTDE
Copy link
Collaborator

Hi Guy,
I see several regressions when tested on my usual test repo. Things like

  1. wrong indentation of continuation lines when a line is too long
  2. open braces joined to original line even when my setup is fully Allman
  3. spaces used instead of tabs when indenting
  4. more files where uncrustify abort with errors instead of completing its tasks.

There could be even more perhaps.

You can access the test files at the locations below:

  • this is the result of uncrustify with PR 3384 applied
  • this is the result of uncrustify/master. Make sure to checkout commit 3d776d4968 for a direct single pass to single pass comparison.

If you compare the two folders, you will see several differences. Look at this file for errors on abort execution (if you compare the two branches, those are clear) and pick pretty much any file that differs to see some examples of the differences.
The config file used was the same in both cases and you can find it here

@micheleCTDE
Copy link
Collaborator

We should not merge this PR as is.

@micheleCTDE
Copy link
Collaborator

Forgot to add that you can access the original non-uncrustified files here, if you want to run a test locally.

Copy link
Collaborator

@gmaurel gmaurel left a comment

Choose a reason for hiding this comment

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

@micheleCTDE has too much errors

@micheleCTDE
Copy link
Collaborator

@micheleCTDE has too much errors

Indeed, way too many. Definitely need some rework. Let me know when you need a new test and I will run again.

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.

Wrong variable indentation when using for loop block + #ifndef + label
3 participants