Thanks for working on this! cinaps comments are actually structure items, and yh they should be allowed everywhere.

Turns out it is toplevel phrases instead, this PR should be ready to be reviewed and tested now.

Ah yes. Although toplevel phrases were for the old way of using cinaps, i.e. when using it as a toplevel. When used via dune, these have to be structure items. Though I guess parsing them as toplevel phrases should be harmless.

I will test that today.

Just one thought: I grepped the dune-universe for (*$ and realised that it is used for qtest as well. Is that a concern?

Just one thought: I grepped the dune-universe for (*$ and realised that it is used for qtest as well. Is that a concern?

I think testing whether there is a blank character after (*$ should be enough.
Edit: afterall the character there is after the opening bracket should make the parsing fail and the comment would not be formatted like OCaml code.

I'm testing this, it seems to be working well except that a ;; is systematically inserted when the code span over multiple lines:

(*$
  ;;
  let x = 1 in
  x + 1
*)

BTW, it's fine to restrict the parsing to structure items only. I expect that toplevel phrases support will eventually disappear given that the new method of using cinaps via dune is much more convenient.

I reverted to using structures instead, so toplevel directives such as #use "import.cinaps";; won't be parsed anymore.

Thanks, I just gave it another try and the comments are being well formatted :)

Just one last issue I found: the trailing $ in $*) is systematically removed.

Just one last issue I found: the trailing $ in $*) is systematically removed.

This is fixed now.

Just tested again, all good👌. Cinaps comments are all nicely formatted :)

@Julow I guess I can submit another PR where I move parseto Parse_with_comments.ml, that should make this PR easier to read.

@Julow I guess I can submit another PR where I move parseto Parse_with_comments.ml, that should make this PR easier to read.

This should not be necessary.