Skip to content

fix: clang-format with AlignTrailingComments: Kind: Leave #1821

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.

Sign up for GitHub

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

Jump to bottom
Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

fix: clang-format with AlignTrailingComments: Kind: Leave #1821

wants to merge 3 commits into from

Conversation

wdconinc
Copy link
Contributor

Briefly, what does this PR introduce?

This PR reformats some files for better stability with newer clang-format defaults (see #1801). This gets rid of the conflicting behavior in e.g.

       }
 
     } // end hits to merge loop
-  }   // end clusters to merge loop
+  } // end clusters to merge loop
 
 } // end 'merge_and_split_clusters(VecClust&, VecProj&, edm4eic::MutableCluster&)'

But it also generally looks worse... You just can't win.

What kind of change does this PR introduce?

  • Bug fix (issue: clang-format 16.0.6 and 20.0.0 are not consistent with our .clang-format)
  • New feature (issue #__)
  • Documentation update
  • Other: __

Please check if this PR fulfills the following:

  • Tests for the changes have been added
  • Documentation has been added / updated
  • Changes have been communicated to collaborators

Does this PR introduce breaking changes? What changes might users need to make to their code?

No.

Does this PR change default behavior?

No.

@github-actions github-actions bot added topic: calorimetry relates to calorimetry topic: tracking Relates to tracking reconstruction topic: PID Relates to PID reconstruction topic: far-forward Far forward reconstruction topic: far-backward Reconstruction related to far backward detectors topic: infrastructure topic: barrel topic: forward topic: backward topic: jets topic: digitization labels Apr 23, 2025
@wdconinc wdconinc marked this pull request as draft April 23, 2025 19:08
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Apr 23, 2025 •
edited
Loading

Capybara summary for PR 1821

@wdconinc wdconinc force-pushed the clang-format-AlignTrailingComments-Kind-Leave branch from 17c4f1f to db4d339 Compare May 31, 2025 17:04
@wdconinc
Copy link
Contributor Author

Rebased, conflicts resolved.

veprbl
veprbl approved these changes May 31, 2025
View reviewed changes
Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

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

Diff looks fine

@wdconinc
Copy link
Contributor Author

Diff looks fine

Yeah but I don't like the setting and it doesn't really fix the formatting mismatch.

@veprbl
Copy link
Member

veprbl commented May 31, 2025

Let's close then?

@wdconinc
Copy link
Contributor Author

Let's close then?

I still intend to come back to this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@veprbl veprbl veprbl approved these changes

Assignees
No one assigned
Labels
topic: backward topic: barrel topic: calorimetry relates to calorimetry topic: digitization topic: far-backward Reconstruction related to far backward detectors topic: far-forward Far forward reconstruction topic: forward topic: infrastructure topic: jets topic: PID Relates to PID reconstruction topic: tracking Relates to tracking reconstruction
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@wdconinc @veprbl