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

Upgrade to ocamlformat 0.26.0 #1479

Merged
merged 2 commits into from
Jul 21, 2023
Merged

Upgrade to ocamlformat 0.26.0 #1479

merged 2 commits into from
Jul 21, 2023

Conversation

Julow
Copy link
Contributor

@Julow Julow commented Jun 27, 2023

The classes are formatted completely differently, which might be problematic.

The aim of this commit is to gather feedback.

Changelog can be found here: https://github.com/ocaml-ppx/ocamlformat/blob/main/CHANGES.md

@Julow Julow marked this pull request as draft June 27, 2023 16:49
hhugo
hhugo reviewed Jun 27, 2023
View reviewed changes
Copy link
Member

@hhugo hhugo left a comment

Choose a reason for hiding this comment

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

After a very very quick look, it looks mostly fine.
The size of the diff regarding indentation in classes makes the whole diff complicated the evaluate. Anyway to split the diff in two commits ? putting the indentation of classes on iits own ?

compiler/lib/js_output.ml Show resolved Hide resolved
@Julow Julow force-pushed the preview-ocamlformat-0.26.0 branch from a036f05 to c03784b Compare June 27, 2023 17:59
@Julow
Copy link
Contributor Author

Julow commented Jun 27, 2023

I splitted the changes to classes into a new commit. This commit is best viewed with git diff -w.

@hhugo
Copy link
Member

hhugo commented Jun 27, 2023

Thanks a lot. LGTM

@Julow
Copy link
Contributor Author

Julow commented Jun 28, 2023

Thanks for the feedback. Let's not merge this until OCamlformat is released.

@Julow Julow force-pushed the preview-ocamlformat-0.26.0 branch from c03784b to 3fd2971 Compare July 10, 2023 10:14
Julow
Julow commented Jul 17, 2023
View reviewed changes
.git-blame-ignore-revs Outdated Show resolved Hide resolved
@Julow Julow force-pushed the preview-ocamlformat-0.26.0 branch from 3fd2971 to 16cac92 Compare July 18, 2023 09:19
@Julow Julow force-pushed the preview-ocamlformat-0.26.0 branch from 16cac92 to cf082c7 Compare July 20, 2023 10:25
@Julow Julow changed the title Preview: Upgrade to ocamlformat 0.26.0 (unreleased) Upgrade to ocamlformat 0.26.0 Jul 20, 2023
@Julow Julow marked this pull request as ready for review July 20, 2023 10:41
@Julow
Copy link
Contributor Author

Julow commented Jul 20, 2023

OCamlformat 0.26.0 has been released! This PR can be merged (not squashed due to .git-blame-ignore-revs) or closed if it's a bit too early to upgrade.

hhugo
hhugo reviewed Jul 20, 2023
View reviewed changes
.git-blame-ignore-revs Outdated Show resolved Hide resolved
@Julow Julow force-pushed the preview-ocamlformat-0.26.0 branch from cf082c7 to d9c92b3 Compare July 20, 2023 11:57
@hhugo hhugo merged commit fdbf60c into ocsigen:master Jul 21, 2023
11 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hhugo hhugo hhugo left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Julow @hhugo