GitLab

Apoorv Ingle pushed to branch wip/ani/hie-spans at Glasgow Haskell Compiler / GHC

Commits:

a5519445
by Apoorv Ingle at 2025-12-22T01:29:50-06:00
```
GeneratedSrcSpan cases for GHCi/UI
```

3 changed files:

compiler/GHC.hs
ghc/GHCi/UI.hs
ghc/GHCi/UI/Info.hs

Changes:

@@ -1617,6 +1617,7 @@ addSourceToTokens _ _ [] = []
  addSourceToTokens loc buf (t@(L span _) : ts)
      = case span of
        UnhelpfulSpan _ -> (t,"") : addSourceToTokens loc buf ts
 +      GeneratedSrcSpan _ -> (t,"") : addSourceToTokens loc buf ts
        RealSrcSpan s _ -> (t,str) : addSourceToTokens newLoc newBuf ts
          where
            (newLoc, newBuf, str) = go "" loc buf

ghc/GHCi/UI.hs

@@ -2692,8 +2692,9 @@ parseSpanArg s = do
  -- @<filename>:(<line>,<col>)-(<line-end>,<col-end>)@
  -- while simply unpacking 'UnhelpfulSpan's
  showSrcSpan :: SrcSpan -> String
 -showSrcSpan (UnhelpfulSpan s)  = unpackFS (unhelpfulSpanFS s)
 -showSrcSpan (RealSrcSpan spn _) = showRealSrcSpan spn
 +showSrcSpan (UnhelpfulSpan s)    = unpackFS (unhelpfulSpanFS s)
 +showSrcSpan (GeneratedSrcSpan _) = unpackFS (unhelpfulSpanFS UnhelpfulGenerated)
 +showSrcSpan (RealSrcSpan spn _)  = showRealSrcSpan spn
  -- | Variant of 'showSrcSpan' for 'RealSrcSpan's
  showRealSrcSpan :: RealSrcSpan -> String
@@ -4235,14 +4236,14 @@ stepLocalCmd arg = withSandboxOnly ":steplocal" $ step arg
        mb_span <- getCurrentBreakSpan
        case mb_span of
          Nothing  -> stepCmd []
 -        Just (UnhelpfulSpan _) -> liftIO $ putStrLn (            -- #14690
 -           ":steplocal is not possible." ++
 -           "\nCannot determine current top-level binding after " ++
 -           "a break on error / exception.\nUse :stepmodule.")
 -        Just loc -> do
 +        Just loc@(RealSrcSpan{}) -> do
             md <- fromMaybe (panic "stepLocalCmd") <$> getCurrentBreakModule
             current_toplevel_decl <- flip enclosingTickSpan loc <$> getTickArray md
             doContinue (GHC.LocalStep (RealSrcSpan current_toplevel_decl Strict.Nothing))
 +        Just _ -> liftIO $ putStrLn (            -- #14690
 +           ":steplocal is not possible." ++
 +           "\nCannot determine current top-level binding after " ++
 +           "a break on error / exception.\nUse :stepmodule.")
  stepModuleCmd :: GhciMonad m => String -> m ()
  stepModuleCmd arg = withSandboxOnly ":stepmodule" $ step arg
@@ -4580,7 +4581,7 @@ listCmd "" = do
            printForUser $ text "Not stopped at a breakpoint; nothing to list"
        Just (RealSrcSpan pan _) ->
            listAround pan True
 -      Just pan@(UnhelpfulSpan _) ->
 +      Just pan@_ ->
            do resumes <- GHC.getResumeContext
               case resumes of
                   [] -> panic "No resumes"

ghc/GHCi/UI/Info.hs

@@ -168,6 +168,7 @@ findName infos span0 mi string =
        Just name ->
          case getSrcSpan name of
            UnhelpfulSpan {} -> tryExternalModuleResolution
 +          GeneratedSrcSpan {} -> tryExternalModuleResolution
            RealSrcSpan   {} -> return (getName name)
    where
      rdrs = modInfo_rdrs mi