Skip to content

Commit

Permalink
fix release notes and Ormolu
Browse files Browse the repository at this point in the history
  • Loading branch information
stefjoosten committed Oct 14, 2023
1 parent b98deac commit 958860b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Release notes of Ampersand

## Unreleased changes
* Brackets in the natural language formatting were erroneous, so I fixed it. This helps to resolve a little bit of our technical debt.
* [Issue #1419](https://github.com/AmpersandTarski/Ampersand/issues/1419) added a test, to be activated in the regression after resolving #1419.
* [Issue #1420](https://github.com/AmpersandTarski/Ampersand/issues/1420) added a test, to be activated in the regression after resolving #1420.
* [Issue #1421](https://github.com/AmpersandTarski/Ampersand/issues/1421) added easier development through Docker image at dockerhub: [ampersandtarski/ampersand-devcontainer](https://hub.docker.com/repository/docker/ampersandtarski/ampersand-devcontainer/general). Also fixes https://github.com/AmpersandTarski/Ampersand/issues/1359
Expand Down
9 changes: 5 additions & 4 deletions src/Ampersand/Output/PredLogic.hs
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,11 @@ predLshow lang vMap = charshow 0
Cod pexpr var -> vMap var <> T.pack " ∈ cod(" <> charshow 8 pexpr <> T.pack ")"
R pexpr rel pexpr'
| isIdent (EDcD rel) -> wrap i 5 (charshow 2 pexpr) <> T.pack " = " <> wrap i 2 (charshow 5 pexpr')
| otherwise -> wrap i 5 $
if T.null (decprL <> decprM <> decprR)
then d <> T.pack " " <> name rel <> T.pack " " <> c
else decprL <> d <> decprM <> c <> decprR
| otherwise ->
wrap i 5 $
if T.null (decprL <> decprM <> decprR)
then d <> T.pack " " <> name rel <> T.pack " " <> c
else decprL <> d <> decprM <> c <> decprR
where
d = wrap i 5 (charshow 5 pexpr)
c = wrap i 5 (charshow 5 pexpr')
Expand Down

0 comments on commit 958860b

Please sign in to comment.