Skip to content

Refine should either do intros or split, not both #1842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 18, 2021
Merged

Refine should either do intros or split, not both #1842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6505f57
Refine should either do intros or split, not both
isovector May 18, 2021
9be1c48
Empty commit for CI
isovector May 18, 2021
b22ae96
Another commit for CI
isovector May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions plugins/hls-tactics-plugin/src/Wingman/Tactics.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,10 +381,7 @@ localTactic t f = do


refine :: TacticsM ()
refine = do
try' intros
try' splitSingle
try' intros
refine = intros <%> splitSingle


auto' :: Int -> TacticsM ()
Expand Down
10 changes: 5 additions & 5 deletions plugins/hls-tactics-plugin/test/CodeAction/RefineSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ spec = do
let refineTest = goldenTest Refine ""

describe "golden" $ do
refineTest 2 8 "RefineIntro"
refineTest 2 8 "RefineCon"
refineTest 4 8 "RefineReader"
refineTest 8 8 "RefineGADT"
refineTest 2 8 "RefineIntro"
refineTest 2 8 "RefineCon"
refineTest 4 10 "RefineReader"
refineTest 8 10 "RefineGADT"

describe "messages" $ do
mkShowMessageTest allFeatures Refine "" 2 8 "MessageForallA" NothingToDo
mkShowMessageTest allFeatures Refine "" 2 8 "MessageForallA" TacticErrors

2 changes: 1 addition & 1 deletion plugins/hls-tactics-plugin/test/golden/RefineGADT.expected.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ data GADT a where
Two :: GADT Bool

test :: z -> GADT Int
test z = One (\ b -> _)
test z = One _

2 changes: 1 addition & 1 deletion plugins/hls-tactics-plugin/test/golden/RefineGADT.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ data GADT a where
Two :: GADT Bool

test :: z -> GADT Int
test = _
test z = _

2 changes: 1 addition & 1 deletion plugins/hls-tactics-plugin/test/golden/RefineReader.expected.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
newtype Reader r a = Reader (r -> a)

test :: b -> Reader r a
test b = Reader (\ r -> _)
test b = Reader _

2 changes: 1 addition & 1 deletion plugins/hls-tactics-plugin/test/golden/RefineReader.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
newtype Reader r a = Reader (r -> a)

test :: b -> Reader r a
test = _
test b = _