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

Ocamlformat the codebase (again) #1834

Merged
merged 7 commits into from
Sep 24, 2024
Merged

Conversation

voodoos
Copy link
Collaborator

@voodoos voodoos commented Sep 23, 2024

I deactivated ocaml-ci so that we can finally format the codebase without breaking the CI..
Options are open for discussion... but not for long :-) @xvw @PizieDust

cc @liam923

Copy link
Collaborator

@xvw xvw left a comment

Choose a reason for hiding this comment

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

Nice!
WDYT about merging #1828 before, in order to include the sherlodoc sublibrary in the formatting process?

@voodoos
Copy link
Collaborator Author

voodoos commented Sep 23, 2024

Nice! WDYT about merging #1828 before, in order to include the sherlodoc sublibrary in the formatting process?

I don't see why the order matters, the sherlodoc sublibrary will be formatted either way :-)

@liam923
Copy link
Contributor

liam923 commented Sep 23, 2024

This looks great to me! I opened a PR against this branch that makes a minor change: voodoos#14

Essentially, it allows you to specify a list of files in src/ocaml and src/utils that should be formatted anyway. This allows us to format files like src/ocaml/typing/msupport.ml, which is a Merlin-specific file despite the folder it is located in.

@PizieDust
Copy link
Contributor

This looks great :)

@voodoos
Copy link
Collaborator Author

voodoos commented Sep 24, 2024

This looks great to me! I opened a PR against this branch that makes a minor change: voodoos#14

Essentially, it allows you to specify a list of files in src/ocaml and src/utils that should be formatted anyway. This allows us to format files like src/ocaml/typing/msupport.ml, which is a Merlin-specific file despite the folder it is located in.

Thank you Liam, I cherry-picked your change and added a few more files.

@voodoos voodoos added the no changelog Turn off CI changelog-check label Sep 24, 2024
@voodoos voodoos merged commit 53ac829 into ocaml:main Sep 24, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no changelog Turn off CI changelog-check
Projects
Status: 4.17-414
Status: 4.17-501
Development

Successfully merging this pull request may close these issues.

4 participants