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.

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

Default line length set to 100 for LF files #1389

Merged
merged 19 commits into from
Jun 8, 2023
Merged

Default line length set to 100 for LF files #1389

merged 19 commits into from
Jun 8, 2023

Conversation

petervdonovan
Copy link
Collaborator

This is done in the name of consistency because we use a line length of 100 in Java files now.

@petervdonovan petervdonovan added ide refactoring Code quality enhancement labels Oct 1, 2022
@lhstrh lhstrh changed the title Change default line length to 100 for LF files. Change default line length to 100 for LF files Oct 1, 2022
@lhstrh lhstrh changed the title Change default line length to 100 for LF files Default line length set to 100 for LF files Oct 1, 2022
@lhstrh
Copy link
Member

lhstrh commented Oct 5, 2022

Should we also change to 2 tabs instead of 4?

@petervdonovan
Copy link
Collaborator Author

Okay, the tests are now formatted with 2 spaces indentation and 100 columns width. I also reformatted some Markdown and build.gradle to match.

@petervdonovan petervdonovan mentioned this pull request Oct 6, 2022
Closed
lhstrh
lhstrh reviewed Oct 10, 2022
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
lhstrh
lhstrh reviewed Oct 11, 2022
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
lhstrh
lhstrh approved these changes Oct 11, 2022
View reviewed changes
Copy link
Member

@lhstrh lhstrh left a comment

Choose a reason for hiding this comment

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

Look good to me, modulo the thing I commented on (and the remaining conflicts).

@petervdonovan petervdonovan marked this pull request as draft October 12, 2022 21:30
@lhstrh
Copy link
Member

lhstrh commented Apr 14, 2023

@petervdonovan: shall we bite the bullet on this and get it merged? Modulo conflicts, this looks ready to me...

@petervdonovan
Copy link
Collaborator Author

shall we bite the bullet on this and get it merged? Modulo conflicts, this looks ready to me...

Yep, I'm on board with this, it seems straightforward and harmless

@petervdonovan petervdonovan marked this pull request as ready for review May 18, 2023 06:22
@petervdonovan
Copy link
Collaborator Author

Sorry, it looks like I forgot to follow through with this one. I just got it back up to date with master and it should be ready to merge. It will cause lots of problems but so be it I guess.

@lhstrh
Copy link
Member

lhstrh commented May 18, 2023

Let's hold off for a bit until we've bitten the bullet on the formatting of the Java code that this is supposed to achieve consistency with...

cmnrd
cmnrd approved these changes May 18, 2023
View reviewed changes
Copy link
Collaborator

@cmnrd cmnrd left a comment

Choose a reason for hiding this comment

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

Great! I would be fine with biting smaller bullets instead of one huge one. I don't see good reasons to hold this off and many conflicts should be resolvable by applying lff in the PRs.

@lhstrh
Copy link
Member

lhstrh commented May 23, 2023

@petervdonovan: let's merge this one too?

@petervdonovan
Apply formatter.
117a02c
@petervdonovan
Address LSP test failure for Python.
1d121ad 
This resulted from the reduced indentation in the tests, which results
in errors being reported on a negative column.
@lhstrh lhstrh marked this pull request as ready for review May 24, 2023 06:40
@lhstrh lhstrh enabled auto-merge June 3, 2023 23:38
@petervdonovan
Copy link
Collaborator Author

It looks like two CCpp federated tests failed. The first one that failed looks like it could be the issues that we have had with the global variables used in name mangling, but the second one is less clear (there is only a tiny snippet of output shown for some reason).

The debug output is quite short, so I don't think this is related to running out of heap space...

auto-merge was automatically disabled June 7, 2023 05:19

Merge queue setting changed

@petervdonovan petervdonovan added this pull request to the merge queue Jun 7, 2023
@cmnrd cmnrd removed this pull request from the merge queue due to a manual request Jun 7, 2023
@cmnrd cmnrd added this pull request to the merge queue Jun 7, 2023
@cmnrd cmnrd removed this pull request from the merge queue due to a manual request Jun 7, 2023
@cmnrd cmnrd added this pull request to the merge queue Jun 7, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jun 7, 2023
@petervdonovan petervdonovan added this pull request to the merge queue Jun 7, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Jun 7, 2023
@lhstrh lhstrh enabled auto-merge June 8, 2023 05:51
@lhstrh lhstrh added this pull request to the merge queue Jun 8, 2023
Merged via the queue into master with commit 9ca5717 Jun 8, 2023
42 checks passed
@cmnrd cmnrd deleted the update-lf-code-width branch June 8, 2023 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhstrh lhstrh lhstrh approved these changes

@cmnrd cmnrd cmnrd approved these changes

Assignees
No one assigned
Labels
ide refactoring Code quality enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@petervdonovan @lhstrh @cmnrd