Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 26b9a8a0 by Arkissa at 2026-10-17T16:04:10+00:00 ghci: Prefer exact source spans in :type-at Prefer expression types for identical source spans. Fixes #27412. - - - - - 12 changed files: - + changelog.d/T27412 - ghc/GHCi/UI/Info.hs - testsuite/tests/ghci/prog-mhu001/prog-mhu001c.stdout - testsuite/tests/ghci/prog-mhu002/prog-mhu002d.stdout - testsuite/tests/ghci/scripts/T16575.script - testsuite/tests/ghci/scripts/T16575.stdout - testsuite/tests/ghci/scripts/T16804.stdout - testsuite/tests/ghci/scripts/T20150.stdout - + testsuite/tests/ghci/scripts/T27412.hs - + testsuite/tests/ghci/scripts/T27412.script - + testsuite/tests/ghci/scripts/T27412.stdout - testsuite/tests/ghci/scripts/all.T Changes: ===================================== changelog.d/T27412 ===================================== @@ -0,0 +1,10 @@ +section: ghci +synopsis: Make ``:type-at`` prefer an exact source span match. +issues: #27412 +mrs: !16332 + +description: { + GHCi's ``:type-at`` command now prefers type information whose source + span exactly matches the requested range. This prevents a multi-line + selection from incorrectly returning the type of a contained expression. +} ===================================== ghc/GHCi/UI/Info.hs ===================================== @@ -61,6 +61,7 @@ data ModInfo = ModInfo -- ^ Generated set of information about all spans in the -- module that correspond to some kind of identifier for -- which there will be type info and/or location info. + -- Sorted by 'leftmost_largest', with enclosing spans before contained spans. , modinfoRdrEnv :: !IfGlobalRdrEnv -- ^ What's in scope in the module. , modinfoLastUpdate :: !UTCTime @@ -202,7 +203,7 @@ resolveNameFromModule infos name = do -- | Try to resolve the type display from the given span. resolveName :: [SpanInfo] -> SpanInfo -> Maybe Var resolveName spans' si = listToMaybe $ mapMaybe spaninfoVar $ - reverse spans' `spaninfosWithin` si + spans' `spaninfosWithin` si -- | Try to find the type of the given span. findType :: GhcMonad m @@ -224,7 +225,7 @@ findType infos span0 string = do -- | Try to resolve the type display from the given span. resolveType :: [SpanInfo] -> SpanInfo -> Maybe Type resolveType spans' si = listToMaybe $ mapMaybe spaninfoType $ - reverse spans' `spaninfosWithin` si + spans' `spaninfosWithin` si -- | Guess a module name from a file path. guessModule :: GhcMonad m @@ -333,7 +334,7 @@ processAllTypeCheckedModule :: TypecheckedModule -> [SpanInfo] processAllTypeCheckedModule tcm = mapMaybe toSpanInfo $ sortBy cmpSpan - $ catMaybes (bts ++ ets ++ pts) + $ catMaybes (ets ++ bts ++ pts) where bts = map getTypeLHsBind $ listifyAllSpans tcs ets = map getTypeLHsExpr $ listifyAllSpans tcs @@ -384,10 +385,8 @@ processAllTypeCheckedModule tcm | (False `mkQ` (const True :: OverLitTc -> Bool)) x = z | otherwise = foldl k (f x) (gmapQ (everythingAllSpans k z f) x) - cmpSpan (_,a,_) (_,b,_) - | a `isSubspanOf` b = LT - | b `isSubspanOf` a = GT - | otherwise = EQ + -- Put enclosing spans first so :type-at prefers exact matches. See (#27412). + cmpSpan (_,a,_) (_,b,_) = leftmost_largest a b -- | Pretty print the types into a 'SpanInfo'. toSpanInfo :: (Maybe Id,SrcSpan,Type) -> Maybe SpanInfo ===================================== testsuite/tests/ghci/prog-mhu001/prog-mhu001c.stdout ===================================== @@ -1,36 +1,36 @@ Collecting type info for 1 module(s) ... :all-types -e/E.hs:(24,1)-(24,12): GHC.Internal.Types.IO () -e/E.hs:(19,1)-(19,3): E.E -> E.E -e/E.hs:(5,1)-(5,3): GHC.Internal.Bignum.Integer.Integer e/E.hs:(3,1)-(3,3): GHC.Internal.Bignum.Integer.Integer -e/E.hs:(7,1)-(7,4): GHC.Internal.Types.IO () -e/E.hs:(15,3)-(15,6): GHC.Internal.Types.Int -> GHC.Internal.Base.String -e/E.hs:(22,3)-(22,6): E.E -> GHC.Internal.Base.String -e/E.hs:(25,3)-(25,10): GHC.Internal.Base.String -> GHC.Internal.Types.IO () -e/E.hs:(25,12)-(25,37): GHC.Internal.Base.String -e/E.hs:(25,3)-(25,37): GHC.Internal.Types.IO () -e/E.hs:(24,16)-(25,37): GHC.Internal.Types.IO () -e/E.hs:(19,9)-(19,9): E.E -e/E.hs:(5,7)-(5,8): GHC.Internal.Bignum.Integer.Integer e/E.hs:(3,7)-(3,7): GHC.Internal.Bignum.Integer.Integer +e/E.hs:(5,1)-(5,3): GHC.Internal.Bignum.Integer.Integer +e/E.hs:(5,7)-(5,8): GHC.Internal.Bignum.Integer.Integer +e/E.hs:(7,1)-(7,4): GHC.Internal.Types.IO () +e/E.hs:(7,8)-(9,11): GHC.Internal.Types.IO () +e/E.hs:(8,3)-(8,11): GHC.Internal.Types.IO () e/E.hs:(8,3)-(8,7): GHC.Internal.Bignum.Integer.Integer -> GHC.Internal.Types.IO () e/E.hs:(8,9)-(8,11): GHC.Internal.Bignum.Integer.Integer -e/E.hs:(8,3)-(8,11): GHC.Internal.Types.IO () +e/E.hs:(9,3)-(9,11): GHC.Internal.Types.IO () e/E.hs:(9,3)-(9,7): GHC.Internal.Bignum.Integer.Integer -> GHC.Internal.Types.IO () e/E.hs:(9,9)-(9,11): GHC.Internal.Bignum.Integer.Integer -e/E.hs:(9,3)-(9,11): GHC.Internal.Types.IO () -e/E.hs:(7,8)-(9,11): GHC.Internal.Types.IO () e/E.hs:(14,10)-(14,17): E.Test GHC.Internal.Types.Int e/E.hs:(14,10)-(14,17): (GHC.Internal.Types.Int -> GHC.Internal.Base.String) -=> E.Test GHC.Internal.Types.Int e/E.hs:(14,10)-(14,17): GHC.Internal.Types.Int -> GHC.Internal.Base.String +e/E.hs:(15,3)-(15,6): GHC.Internal.Types.Int -> GHC.Internal.Base.String e/E.hs:(15,10)-(15,13): GHC.Internal.Types.Int -> GHC.Internal.Base.String +e/E.hs:(19,1)-(19,3): E.E -> E.E +e/E.hs:(19,5)-(19,5): E.E +e/E.hs:(19,9)-(19,9): E.E e/E.hs:(21,10)-(21,15): E.Test E.E e/E.hs:(21,10)-(21,15): (E.E -> GHC.Internal.Base.String) -=> E.Test E.E e/E.hs:(21,10)-(21,15): E.E -> GHC.Internal.Base.String -e/E.hs:(22,12)-(22,14): GHC.Internal.Base.String -e/E.hs:(19,5)-(19,5): E.E +e/E.hs:(22,3)-(22,6): E.E -> GHC.Internal.Base.String e/E.hs:(22,8)-(22,8): E.E +e/E.hs:(22,12)-(22,14): GHC.Internal.Base.String +e/E.hs:(24,1)-(24,12): GHC.Internal.Types.IO () +e/E.hs:(24,16)-(25,37): GHC.Internal.Types.IO () +e/E.hs:(25,3)-(25,37): GHC.Internal.Types.IO () +e/E.hs:(25,3)-(25,10): GHC.Internal.Base.String -> GHC.Internal.Types.IO () +e/E.hs:(25,12)-(25,37): GHC.Internal.Base.String :type-at :: Integer :: Int -> String ===================================== testsuite/tests/ghci/prog-mhu002/prog-mhu002d.stdout ===================================== @@ -1,15 +1,11 @@ Collecting type info for 4 module(s) ... -a/A.hs:(7,1)-(7,6): GHC.Internal.Bignum.Integer.Integer a/A.hs:(5,1)-(5,3): GHC.Internal.Bignum.Integer.Integer -a/A.hs:(9,22)-(9,25): GHC.Internal.Types.Int -> A.A -> GHC.Internal.Show.ShowS -a/A.hs:(9,22)-(9,25): A.A -> GHC.Internal.Base.String -a/A.hs:(9,22)-(9,25): [A.A] -> GHC.Internal.Show.ShowS -a/A.hs:(12,3)-(12,6): A.A -> GHC.Internal.Base.String -a/A.hs:(7,10)-(7,11): GHC.Internal.Bignum.Integer.Integer -a/A.hs:(5,11)-(5,11): GHC.Internal.Bignum.Integer.Integer -> GHC.Internal.Bignum.Integer.Integer -> GHC.Internal.Bignum.Integer.Integer +a/A.hs:(5,7)-(5,18): GHC.Internal.Bignum.Integer.Integer a/A.hs:(5,7)-(5,9): GHC.Internal.Bignum.Integer.Integer +a/A.hs:(5,11)-(5,11): GHC.Internal.Bignum.Integer.Integer -> GHC.Internal.Bignum.Integer.Integer -> GHC.Internal.Bignum.Integer.Integer a/A.hs:(5,13)-(5,18): GHC.Internal.Bignum.Integer.Integer -a/A.hs:(5,7)-(5,18): GHC.Internal.Bignum.Integer.Integer +a/A.hs:(7,1)-(7,6): GHC.Internal.Bignum.Integer.Integer +a/A.hs:(7,10)-(7,11): GHC.Internal.Bignum.Integer.Integer a/A.hs:(9,22)-(9,25): GHC.Internal.Show.Show A.A a/A.hs:(9,22)-(9,25): ([A.A] -> GHC.Internal.Show.ShowS) -=> GHC.Internal.Show.Show A.A a/A.hs:(9,22)-(9,25): (A.A -> GHC.Internal.Base.String) -=> ([A.A] -> GHC.Internal.Show.ShowS) -=> GHC.Internal.Show.Show A.A @@ -17,25 +13,29 @@ a/A.hs:(9,22)-(9,25): (GHC.Internal.Types.Int -> A.A -> GHC.Internal.Show.ShowS) a/A.hs:(9,22)-(9,25): GHC.Internal.Types.Int -> A.A -> GHC.Internal.Show.ShowS a/A.hs:(9,22)-(9,25): A.A -> GHC.Internal.Base.String a/A.hs:(9,22)-(9,25): [A.A] -> GHC.Internal.Show.ShowS +a/A.hs:(9,22)-(9,25): GHC.Internal.Types.Int -> A.A -> GHC.Internal.Show.ShowS +a/A.hs:(9,22)-(9,25): A.A -> GHC.Internal.Base.String +a/A.hs:(9,22)-(9,25): [A.A] -> GHC.Internal.Show.ShowS a/A.hs:(11,10)-(11,15): B.Test A.A a/A.hs:(11,10)-(11,15): (A.A -> GHC.Internal.Base.String) -=> B.Test A.A a/A.hs:(11,10)-(11,15): A.A -> GHC.Internal.Base.String +a/A.hs:(12,3)-(12,6): A.A -> GHC.Internal.Base.String a/A.hs:(12,10)-(12,13): A.A -> GHC.Internal.Base.String b/B.hs:(3,1)-(3,3): GHC.Internal.Bignum.Integer.Integer -b/B.hs:(9,3)-(9,6): GHC.Internal.Types.Int -> GHC.Internal.Base.String b/B.hs:(3,7)-(3,8): GHC.Internal.Bignum.Integer.Integer b/B.hs:(8,10)-(8,17): B.Test GHC.Internal.Types.Int b/B.hs:(8,10)-(8,17): (GHC.Internal.Types.Int -> GHC.Internal.Base.String) -=> B.Test GHC.Internal.Types.Int b/B.hs:(8,10)-(8,17): GHC.Internal.Types.Int -> GHC.Internal.Base.String +b/B.hs:(9,3)-(9,6): GHC.Internal.Types.Int -> GHC.Internal.Base.String b/B.hs:(9,10)-(9,13): GHC.Internal.Types.Int -> GHC.Internal.Base.String -c/C.hs:(4,1)-(4,3): GHC.Internal.Bignum.Integer.Integer c/C.hs:(3,1)-(3,3): GHC.Internal.Bignum.Integer.Integer -c/C.hs:(4,7)-(4,7): GHC.Internal.Bignum.Integer.Integer c/C.hs:(3,7)-(3,7): GHC.Internal.Bignum.Integer.Integer -d/Main.hs:(5,1)-(5,4): GHC.Internal.Bignum.Integer.Integer +c/C.hs:(4,1)-(4,3): GHC.Internal.Bignum.Integer.Integer +c/C.hs:(4,7)-(4,7): GHC.Internal.Bignum.Integer.Integer d/Main.hs:(3,1)-(3,4): GHC.Internal.Types.IO () -d/Main.hs:(5,8)-(5,8): GHC.Internal.Bignum.Integer.Integer +d/Main.hs:(3,1)-(3,4): GHC.Internal.Types.IO () +d/Main.hs:(3,8)-(3,30): GHC.Internal.Types.IO () d/Main.hs:(3,8)-(3,15): GHC.Internal.Base.String -> GHC.Internal.Types.IO () d/Main.hs:(3,17)-(3,30): GHC.Internal.Base.String -d/Main.hs:(3,8)-(3,30): GHC.Internal.Types.IO () -d/Main.hs:(3,1)-(3,4): GHC.Internal.Types.IO () +d/Main.hs:(5,1)-(5,4): GHC.Internal.Bignum.Integer.Integer +d/Main.hs:(5,8)-(5,8): GHC.Internal.Bignum.Integer.Integer ===================================== testsuite/tests/ghci/scripts/T16575.script ===================================== @@ -7,12 +7,13 @@ -- ^^^^ :type-at T16575.hs 4 15 4 19 -- wrongly outputs: --- :: [X] -> ShowS +-- :: Show X + -- instance Eq X where -- ^^^^ :type-at T16575.hs 6 10 6 14 -- wrongly outputs: --- :: X -> X -> Bool +-- :: Eq X -- also note how :all-types is inconsistent with :type-at ===================================== testsuite/tests/ghci/scripts/T16575.stdout ===================================== @@ -1,9 +1,4 @@ Collecting type info for 1 module(s) ... -T16575.hs:(4,15)-(4,18): GHC.Internal.Types.Int -> Ghost.X -> GHC.Internal.Show.ShowS -T16575.hs:(4,15)-(4,18): Ghost.X -> GHC.Internal.Base.String -T16575.hs:(4,15)-(4,18): [Ghost.X] -> GHC.Internal.Show.ShowS -T16575.hs:(7,7)-(7,8): Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool -T16575.hs:(6,10)-(6,13): Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool T16575.hs:(4,15)-(4,18): GHC.Internal.Show.Show Ghost.X T16575.hs:(4,15)-(4,18): ([Ghost.X] -> GHC.Internal.Show.ShowS) -=> GHC.Internal.Show.Show Ghost.X T16575.hs:(4,15)-(4,18): (Ghost.X -> GHC.Internal.Base.String) -=> ([Ghost.X] -> GHC.Internal.Show.ShowS) -=> GHC.Internal.Show.Show Ghost.X @@ -11,19 +6,24 @@ T16575.hs:(4,15)-(4,18): (GHC.Internal.Types.Int -> Ghost.X -> GHC.Internal.Show T16575.hs:(4,15)-(4,18): GHC.Internal.Types.Int -> Ghost.X -> GHC.Internal.Show.ShowS T16575.hs:(4,15)-(4,18): Ghost.X -> GHC.Internal.Base.String T16575.hs:(4,15)-(4,18): [Ghost.X] -> GHC.Internal.Show.ShowS +T16575.hs:(4,15)-(4,18): GHC.Internal.Types.Int -> Ghost.X -> GHC.Internal.Show.ShowS +T16575.hs:(4,15)-(4,18): Ghost.X -> GHC.Internal.Base.String +T16575.hs:(4,15)-(4,18): [Ghost.X] -> GHC.Internal.Show.ShowS T16575.hs:(6,10)-(6,13): GHC.Internal.Classes.Eq Ghost.X T16575.hs:(6,10)-(6,13): (Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool) -=> GHC.Internal.Classes.Eq Ghost.X T16575.hs:(6,10)-(6,13): (Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool) -=> (Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool) -=> GHC.Internal.Classes.Eq Ghost.X T16575.hs:(6,10)-(6,13): Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool T16575.hs:(6,10)-(6,13): Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool -T16575.hs:(7,14)-(7,17): GHC.Internal.Types.Bool -T16575.hs:(8,14)-(8,17): GHC.Internal.Types.Bool -T16575.hs:(9,14)-(9,18): GHC.Internal.Types.Bool +T16575.hs:(6,10)-(6,13): Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool T16575.hs:(7,5)-(7,5): Ghost.X +T16575.hs:(7,7)-(7,8): Ghost.X -> Ghost.X -> GHC.Internal.Types.Bool T16575.hs:(7,10)-(7,10): Ghost.X +T16575.hs:(7,14)-(7,17): GHC.Internal.Types.Bool T16575.hs:(8,5)-(8,5): Ghost.X T16575.hs:(8,10)-(8,10): Ghost.X +T16575.hs:(8,14)-(8,17): GHC.Internal.Types.Bool T16575.hs:(9,5)-(9,5): Ghost.X T16575.hs:(9,10)-(9,10): Ghost.X - :: [X] -> ShowS - :: X -> X -> Bool +T16575.hs:(9,14)-(9,18): GHC.Internal.Types.Bool + :: Show X + :: Eq X ===================================== testsuite/tests/ghci/scripts/T16804.stdout ===================================== @@ -109,7 +109,7 @@ undefined :: forall a. GHC.Internal.Stack.Types.HasCallStack => a % ^~~^
instance Monoid Test where % output: -undefined :: [Test] -> ShowS +undefined :: Show Test
% executing: ":uses T16804a.hs 5 6 5 9" % file snippet: @@ -178,7 +178,7 @@ undefined :: forall a. GHC.Internal.Stack.Types.HasCallStack => a % ^~~~~~~~~~^
mempty = A % output: -undefined :: [Test] -> Test +undefined :: Monoid Test
% executing: ":type-at T16804a.hs 8 3 8 8 undefined" % file snippet: @@ -610,8 +610,8 @@ T16804a.hs:(28,5)-(28,6)
B <> _ = B % output: T16804a.hs:(28,8)-(28,10) -T16804a.hs:(28,14)-(28,16) T16804a.hs:(28,8)-(28,10) +T16804a.hs:(28,14)-(28,16)
% executing: ":uses T16804a.hs 28 14 28 16" % file snippet: @@ -621,8 +621,8 @@ T16804a.hs:(28,8)-(28,10)
B <> _ = B % output: T16804a.hs:(28,8)-(28,10) -T16804a.hs:(28,14)-(28,16) T16804a.hs:(28,8)-(28,10) +T16804a.hs:(28,14)-(28,16)
% executing: ":uses T16804a.hs 29 3 29 3" % file snippet: @@ -777,8 +777,8 @@ T16804c.hs:(6,1)-(6,1)
% output: T16804c.hs:(9,12)-(9,14) -T16804c.hs:(9,33)-(9,35) T16804c.hs:(9,12)-(9,14) +T16804c.hs:(9,33)-(9,35) % executing: ":uses T16804c.hs 9 31 9 31" % file snippet: @@ -798,8 +798,8 @@ T16804c.hs:(9,31)-(9,31)
% output: T16804c.hs:(9,12)-(9,14) -T16804c.hs:(9,33)-(9,35) T16804c.hs:(9,12)-(9,14) +T16804c.hs:(9,33)-(9,35) % executing: ":uses T16804c.hs 12 13 12 13" % file snippet: @@ -809,8 +809,8 @@ T16804c.hs:(9,12)-(9,14)
% output: T16804c.hs:(12,13)-(12,13) -T16804c.hs:(12,32)-(12,32) T16804c.hs:(12,13)-(12,13) +T16804c.hs:(12,32)-(12,32) % executing: ":uses T16804c.hs 12 32 12 32" % file snippet: @@ -820,8 +820,8 @@ T16804c.hs:(12,13)-(12,13)
% output: T16804c.hs:(12,13)-(12,13) -T16804c.hs:(12,32)-(12,32) T16804c.hs:(12,13)-(12,13) +T16804c.hs:(12,32)-(12,32) % executing: ":uses T16804c.hs 15 13 15 13" % file snippet: @@ -830,8 +830,8 @@ T16804c.hs:(12,13)-(12,13) % ^ % output: T16804c.hs:(15,13)-(15,13) -T16804c.hs:(15,30)-(15,30) T16804c.hs:(15,13)-(15,13) +T16804c.hs:(15,30)-(15,30) % executing: ":uses T16804c.hs 15 30 15 30" % file snippet: @@ -840,5 +840,5 @@ T16804c.hs:(15,13)-(15,13) % ^ % output: T16804c.hs:(15,13)-(15,13) -T16804c.hs:(15,30)-(15,30) T16804c.hs:(15,13)-(15,13) +T16804c.hs:(15,30)-(15,30) ===================================== testsuite/tests/ghci/scripts/T20150.stdout ===================================== @@ -1,4 +1,4 @@ Collecting type info for 1 module(s) ... T20150.hs:(7,1)-(7,3): GHC.Internal.StaticPtr.StaticPtr GHC.Internal.Types.Int -T20150.hs:(7,14)-(7,14): GHC.Internal.Types.Int T20150.hs:(7,7)-(7,14): GHC.Internal.StaticPtr.StaticPtr GHC.Internal.Types.Int +T20150.hs:(7,14)-(7,14): GHC.Internal.Types.Int ===================================== testsuite/tests/ghci/scripts/T27412.hs ===================================== @@ -0,0 +1,8 @@ +module T27412 where + +foo :: IO () +foo = + mapM_ (\(x, y) -> do + print x + print y) + [(True, False)] ===================================== testsuite/tests/ghci/scripts/T27412.script ===================================== @@ -0,0 +1,3 @@ +:set +c +:load T27412.hs +:type-at T27412.hs 5 3 7 14 ===================================== testsuite/tests/ghci/scripts/T27412.stdout ===================================== @@ -0,0 +1,2 @@ +Collecting type info for 1 module(s) ... + :: [(Bool, Bool)] -> IO () ===================================== testsuite/tests/ghci/scripts/all.T ===================================== @@ -385,6 +385,7 @@ test('ListTuplePunsPpr', normal, ghci_script, ['ListTuplePunsPpr.script']) test('ListTuplePunsPprNoAbbrevTuple', [limit_stdout_lines(14)], ghci_script, ['ListTuplePunsPprNoAbbrevTuple.script']) test('T24459', normal, ghci_script, ['T24459.script']) test('T24632', normal, ghci_script, ['T24632.script']) +test('T27412', normal, ghci_script, ['T27412.script']) # bytecode backend doesn't support '-finfo-table-map' (#27039) test('bytecodeIPE', [ extra_hc_opts('-finfo-table-map') View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/26b9a8a02a5c5dc2471d2aa4ac7df48b... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/26b9a8a02a5c5dc2471d2aa4ac7df48b... You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help