1
1
mirror of https://github.com/google/ormolu.git synced 2024-07-07 04:36:22 +03:00
Go to file
2021-02-17 17:54:58 -08:00
.buildkite Switch to leading commas in tuples and lists 2021-02-16 20:24:22 -08:00
.github/workflows update CI for release binaries 2020-12-13 17:17:49 +01:00
app Simplify the definition of ‘optParserInfo’ 2020-12-11 22:06:38 +01:00
data Fix a weird formatting on RecordDotSyntax support. (#3) 2021-02-17 14:24:05 -08:00
expected-failures Test with GHC 8.10.3 2021-01-04 22:43:38 +01:00
nix Test with GHC 8.10.3 2021-01-04 22:43:38 +01:00
region-tests Switch to leading commas in tuples and lists 2021-02-16 20:24:22 -08:00
src Fix a weird formatting on RecordDotSyntax support. (#3) 2021-02-17 14:24:05 -08:00
tests Add ‘--color’ for controlling how diffs are printed 2020-11-15 20:50:38 +01:00
.gitignore Add stack.yaml.lock to ignored files 2019-11-07 15:39:13 +01:00
CHANGELOG.md Group StandaloneKindSignatures with type synonyms 2021-02-02 21:15:27 +01:00
CONTRIBUTING.md Replace “idempotency” with “idempotence” 2020-04-27 15:16:40 +02:00
default.nix Test with GHC 8.10.3 2021-01-04 22:43:38 +01:00
DESIGN.md Update design notes for CPP. 2020-04-24 23:08:37 +02:00
format.sh Format Cabal file with ‘cabal format’ 2020-04-26 22:10:43 +02:00
LICENSE.md Replace current year with the word "present" 2019-07-02 21:27:45 +02:00
ormolu.cabal Group StandaloneKindSignatures with type synonyms 2021-02-02 21:15:27 +01:00
README.md Add our own README, and rename the original one. (#4) 2021-02-17 17:54:58 -08:00
README.tweag.md Add our own README, and rename the original one. (#4) 2021-02-17 17:54:58 -08:00
Setup.hs Initial commit 2018-11-25 20:51:22 +07:00
shell.nix nix: allow to pass the system attribute 2020-08-21 14:51:37 +02:00

Ormolu

This is not an official Google product.

This is Google's fork of the original Tweag's Ormolu repository with a few changes on top of it.

Notable differences from the original Ormolu:

  • Commas come at the beginning for tuples and lists
  • In type signatures, arrows and double-colons come at the beginning
  • Less vertical space for parenthesized multi-line code

Maintaining the Repository

We occasionally pull in upstream changes from the Tweag's repository. Because there are very few deviations from the original Ormolu, we want to make them prominent by always having them on top of the commit chain. So when we pull in upstream changes, follow this procedure.

  1. Pull Tweag's master branch into the master branch of this repo
  2. Rebase the gfork branch on top of master
  3. Verify all the tests pass; fix them if not

You may encounter merge conflicts at step 2. Please resolve them properly.

One downside of rebasing is that the hashes of the commits in the gfork branch change every time the rebase happens on top of the new master. This is a small price we have to pay to have the deviating commits clearly visible.