Skip to content

Refactor and clean up mode syntax - #108

Merged
riaqn merged 15 commits into
janefrom
ocamlformat-align-at-atat
Jun 2, 2025
Merged

riaqn merged 15 commits into
janefrom
ocamlformat-align-at-atat

Conversation

@riaqn

@riaqn riaqn commented Apr 18, 2025 •

Copy link
Copy Markdown

This PR imports the latest changes from the compiler, and does some clean-up:

Currently it has a few issues:

  • comments' relative locations are not preserved
  • indentation are messy

@dvulakh
dvulakh force-pushed the ocamlformat-align-at-atat branch from 9bb1c5d to fcc42cf Compare May 1, 2025 20:53
Comment thread lib/Fmt_ast.ml
Comment thread lib/Fmt_ast.ml Outdated
Comment thread test/passing/tests/modes-erased.ml.js-ref
@riaqn

riaqn commented May 6, 2025

Copy link
Copy Markdown
Author

I've reviewed @dvulakh 's commits until "fix handling of parser edge-case"

riaqn and others added 14 commits May 7, 2025 17:36
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
just needed to up the iterations in [opts]

Signed-off-by: David Vulakh <dvulakh@janestreet.com>
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
@dvulakh
dvulakh force-pushed the ocamlformat-align-at-atat branch from 3197611 to a93c0c7 Compare May 7, 2025 21:36
Signed-off-by: David Vulakh <dvulakh@janestreet.com>
@dvulakh
dvulakh marked this pull request as ready for review May 30, 2025 19:54
@dvulakh
dvulakh self-requested a review May 30, 2025 19:55

@dvulakh dvulakh left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I'm happy to merge this in its current state. I haven't been able to figure out why the MacOS CI is broken, but am in favor of merging anyways and fixing later if we end up internally blocked on this PR.

@riaqn
riaqn merged commit 4ddc324 into jane Jun 2, 2025
@dvulakh
dvulakh deleted the ocamlformat-align-at-atat branch June 4, 2025 13:47
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.

2 participants