Skip to content

Restore previous functionality for pre-post extension points#1342

Merged
gpetiot merged 1 commit intomasterfrom
pre-post-ext
May 13, 2020
Merged

Restore previous functionality for pre-post extension points#1342
gpetiot merged 1 commit intomasterfrom
pre-post-ext

Conversation

@jberdine
Copy link
Copy Markdown
Collaborator

plus a test case

@jberdine jberdine requested a review from gpetiot April 19, 2020 14:39
@jberdine jberdine changed the title Partial revert of 046316a to restore the functionality added by ba0177d Restore previous functionality for pre-post extension points Apr 28, 2020
@jberdine
Copy link
Copy Markdown
Collaborator Author

Any feedback on this one? It is one we need to upgrade.

@gpetiot gpetiot added this to the 0.15.0 milestone May 2, 2020
@jberdine
Copy link
Copy Markdown
Collaborator Author

Any feedback on this one?

Copy link
Copy Markdown
Collaborator

@gpetiot gpetiot left a comment

Choose a reason for hiding this comment

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

Looks good to me, sorry for removing this code in the first place.

@jberdine
Copy link
Copy Markdown
Collaborator Author

Don't worry, it was hard to decipher that code and there wasn't a test originally.

@gpetiot gpetiot force-pushed the pre-post-ext branch 2 times, most recently from b78f488 to f1c218d Compare May 13, 2020 11:55
@gpetiot
Copy link
Copy Markdown
Collaborator

gpetiot commented May 13, 2020

I rebased and was going to merge it but something is wrong, it includes #1196 even though it is already merged (starting from a fresh and clean repository didn't help). Does somebody have an idea?
edit: managed to cleanup and rebase properly, but looks like the 0.14.2 tag is messed up in some way

@gpetiot gpetiot merged commit c585d8d into master May 13, 2020
@gpetiot gpetiot deleted the pre-post-ext branch May 13, 2020 12:34
@jberdine
Copy link
Copy Markdown
Collaborator Author

Re the 0.14.2 tag, it is on a commit not an ancestor of master without the pr number. I guess the tag should be moved to the commit f0f9606, I guess created by the github ui.

emillon added a commit to emillon/opam-repository that referenced this pull request Aug 6, 2020
CHANGES:

#### Changes

  + Do not break inline elements such as `{i blah}` in docstrings (ocaml-ppx/ocamlformat#1346, @jberdine)

  + Distinguish hash-getter from hash-comparison infix operators. Operators of the form `#**#` or `#**.` where `**` can be 0 or more operator chars are considered getter operators and are not surrounded by spaces, as opposed to regular infix operators (ocaml-ppx/ocamlformat#1376, @gpetiot)

  + Type constraint on return type of functions is now always printed before the function body (ocaml-ppx/ocamlformat#1381, ocaml-ppx/ocamlformat#1397, @gpetiot)

#### Bug fixes

  + Restore previous functionality for pre-post extension points (ocaml-ppx/ocamlformat#1342, @jberdine)

  + Fix extra break before `function` body of a `fun` (ocaml-ppx/ocamlformat#1343, @jberdine)
    Indent further args of anonymous functions (ocaml-ppx/ocamlformat#1440, @gpetiot)

  + Do not clear the emacs `*compilation*` buffer on successful reformat (ocaml-ppx/ocamlformat#1350, @jberdine)

  + Fix disabling with attributes on OCaml < 4.08 (ocaml-ppx/ocamlformat#1322, @emillon)

  + Preserve unwrapped comments by not adding artificial breaks when `wrap-comments=false` and `ocp-indent-compat=true` are set to avoid interfering with ocp-indent indentation. (ocaml-ppx/ocamlformat#1352, @gpetiot)

  + Break long literal strings at the margin (ocaml-ppx/ocamlformat#1367, @gpetiot)

  + Break after a multiline argument in an argument list (ocaml-ppx/ocamlformat#1360, @gpetiot)

  + Remove unnecessary parens around object (ocaml-ppx/ocamlformat#1379, @gpetiot)

  + Fix placement of comments on constants (ocaml-ppx/ocamlformat#1383, @gpetiot)

  + Do not escape arguments of some Odoc tags (ocaml-ppx/ocamlformat#1391, 1408, @gpetiot, @Julow)
    The characters `[]{}` must not be escaped in the arguments of `@raise`, `@author`, `@version` and others.

  + Fix missing open line between multi-line let-binding with poly-typexpr (ocaml-ppx/ocamlformat#1372, @jberdine)

  + Remove trailing space after expression when followed by an attribute and break before attributes attached to multi-line phrases (ocaml-ppx/ocamlformat#1382, @gpetiot)

  + Do not add a space to minimal comments `(* *)`, `(** *)` and `(*$ *)` (ocaml-ppx/ocamlformat#1407, @gpetiot)

  + Fix attributes position in labelled arguments type (ocaml-ppx/ocamlformat#1434, @gpetiot)

  + Add missing parens around type annotation in anonymous function (ocaml-ppx/ocamlformat#1433, @gpetiot)

  + Fix alignment of 'then' keyword in parenthesised expression (ocaml-ppx/ocamlformat#1421, @gpetiot)

#### New features

  + Support quoted extensions (added in ocaml 4.11) (ocaml-ppx/ocamlformat#1405, @gpetiot)

  + Recognise eliom file extensions (ocaml-ppx/ocamlformat#1430, @jrochel)
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.

3 participants