Skip to content

Wingman: maintain user-defined fixity for definitions#1697

Merged
mergify[bot] merged 17 commits into
haskell:masterfrom
isovector:split-keep-fixity
Jul 14, 2021
Merged

Wingman: maintain user-defined fixity for definitions#1697
mergify[bot] merged 17 commits into
haskell:masterfrom
isovector:split-keep-fixity

Conversation

@isovector

@isovector isovector commented Apr 9, 2021

Copy link
Copy Markdown
Collaborator

This PR makes Wingman respect user-defined fixities when performing case splits. However, if the user didn't explicitly bind any arguments, it will choose to use infix for a symbolically-named functions.

Fixes #1610

@jneira jneira added pr: needs rebase status: blocked Not actionable, because blocked by upstream/GHC etc. labels Apr 26, 2021
@isovector

Copy link
Copy Markdown
Collaborator Author

This is now fixed upstream. I plan to tackle it later tonight if time permits.

@isovector
isovector marked this pull request as ready for review July 9, 2021 14:34
@isovector isovector removed pr: needs rebase status: blocked Not actionable, because blocked by upstream/GHC etc. labels Jul 9, 2021
@isovector

Copy link
Copy Markdown
Collaborator Author

@berberman nix builds seem to be failing --- any idea what's up?

@berberman

Copy link
Copy Markdown
Collaborator

@berberman nix builds seem to be failing --- any idea what's up?

Don't worry, nix/build jobs are broken because this PR introduces ghc-source-gen-0.4.1.0 which nix doesn't know. The jobs are not in branch protection rules and can be fixed later (which only affect creating binaries for nix).

For people who are interested this, the fix would be just overriding ghc-source-gen-0.4.1.0 here:

tweaks = hself: hsuper:
with haskell.lib; {
hls-tactics-plugin = hsuper.hls-tactics-plugin.override {
refinery = hself.refinery_0_3_0_0;
};
hiedb = hself.callCabal2nix "hiedb"
(builtins.fetchTarball {
url =
"https://hackage.haskell.org/package/hiedb-0.4.0.0/hiedb-0.4.0.0.tar.gz";
sha256 =
"13jz8c46zfpf54ya2wsv4akhn0wcfc6qjazqsjfir5gpvsi7v8xr";
}) { };
};

@isovector

Copy link
Copy Markdown
Collaborator Author

Tests (minus nix) are green!

@isovector
isovector requested review from Ailrun and pepeiborra July 9, 2021 18:03

@Ailrun Ailrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thank you, LGTM.

@isovector isovector added the merge me Label to trigger pull request merge label Jul 9, 2021
@isovector

Copy link
Copy Markdown
Collaborator Author

CI is hitting this actions/checkout#23, which claims to be fixed but clearly isn't.

@isovector

Copy link
Copy Markdown
Collaborator Author

@berberman , it appears CI for 9.0.1 is broken. The error I get is this:

Cloning into '/home/runner/work/haskell-language-server/haskell-language-server/dist-newstyle/src/operation_-2cf41f8926150174'...
fatal: reference is not a tree: 0e062895678f49fd673ae493371262cfb8c5ab56

but only on 9.0.1. So I dug in, and noticed that commit referenced in stack-9.0.1.yaml. But it no longer appears to exist on your branch, I'm guessing because it was deleted after being merged here: HeinrichApfelmus/operational#26

@isovector

Copy link
Copy Markdown
Collaborator Author

Blocked by #2016

@mergify
mergify Bot merged commit 160c509 into haskell:master Jul 14, 2021
@isovector

Copy link
Copy Markdown
Collaborator Author

\o/

@isovector
isovector deleted the split-keep-fixity branch July 19, 2021 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge me Label to trigger pull request merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Wingman agda-split transforms infix into prefix

4 participants