Skip to content

Commit 77bcd55

Browse files
committed
Merge branch 'dont-award-unused-matches' into refinery-v5
2 parents d80fc2c + 7ec618b commit 77bcd55

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

plugins/hls-tactics-plugin/src/Wingman/CodeGen.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ destruct' use_field_puns f hi jdg = do
225225
$ disallowing AlreadyDestructed (S.singleton term) jdg
226226
pure $ ext
227227
& #syn_trace %~ rose ("destruct " <> show term) . pure
228-
& #syn_used_vals %~ S.insert term
229228
& #syn_val %~ noLoc . case' (var' term)
230229

231230

plugins/hls-tactics-plugin/src/Wingman/Tactics.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ assume name = rule $ \jdg -> do
6565
-- reasonable for a default value.
6666
(pure (noLoc $ var' name))
6767
{ syn_trace = tracePrim $ "assume " <> occNameString name
68-
, syn_used_vals = S.singleton name
68+
, syn_used_vals = S.singleton name <> getAncestry jdg name
6969
}
7070
Nothing -> cut
7171

@@ -300,7 +300,7 @@ apply (Unsaturated n) hi = tracing ("apply' " <> show (hi_name hi)) $ do
300300
) saturated_args
301301
pure $
302302
ext
303-
& #syn_used_vals %~ S.insert func
303+
& #syn_used_vals %~ (\x -> S.insert func x <> getAncestry jdg func)
304304
& #syn_val %~ mkApply func . fmap unLoc
305305

306306
application :: TacticsM ()

plugins/hls-tactics-plugin/test/CodeAction/AutoSpec.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ spec = do
4949
autoTest 2 25 "AutoInfixInfix"
5050
autoTest 19 12 "AutoTypeLevel"
5151
autoTest 11 9 "AutoForallClassMethod"
52+
autoTest 2 8 "AutoUnusedPatternMatch"
5253

5354
failing "flaky in CI" $
5455
autoTest 2 11 "GoldenApplicativeThen"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
test :: Bool -> ()
2+
test _ = ()
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
test :: Bool -> ()
2+
test = _

0 commit comments

Comments
 (0)