From e0c11910befd96e9dfa98cd393e7d8799376c9af Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Thu, 18 Aug 2022 23:46:43 +1000 Subject: more linting of disambiguating --- src/HaskellCodeExplorer/ModuleInfo.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/HaskellCodeExplorer/ModuleInfo.hs') diff --git a/src/HaskellCodeExplorer/ModuleInfo.hs b/src/HaskellCodeExplorer/ModuleInfo.hs index 5aeb6bd..c651945 100644 --- a/src/HaskellCodeExplorer/ModuleInfo.hs +++ b/src/HaskellCodeExplorer/ModuleInfo.hs @@ -28,7 +28,8 @@ import qualified Data.IntervalMap.Strict as IVM import qualified Data.List as L hiding ( span ) import qualified Data.Map.Strict as M -import Data.Maybe ( fromMaybe +import Data.Maybe ( fromJust + , fromMaybe , mapMaybe ) import qualified Data.Set as S @@ -168,7 +169,7 @@ createModuleInfo (fileMap, defSiteMap, moduleNameMap) (flags, unitState, typeche = let globalRdrEnv = tcg_rdr_env . fst . tm_internals_ $ typecheckedModule modInfo = moduleInfo typecheckedModule - (Just (hsGroup, _, _, _)) = renamedSource typecheckedModule + (hsGroup, _, _, _) = fromJust $ renamedSource typecheckedModule exportedNamesSet = S.fromList $ modInfoExportsWithSelectors modInfo -------------------------------------------------------------------------------- -- Preprocessed source @@ -615,8 +616,8 @@ createDeclarations flags hsGroup typeEnv exportedSet transformation = foldAST :: Environment -> TypecheckedModule -> SourceInfo foldAST environment typecheckedModule = let - (Just renamed@(_, importDecls, mbExported, _)) = - renamedSource typecheckedModule + renamed@(_, importDecls, mbExported, _) = + fromJust $ renamedSource typecheckedModule emptyASTState = ASTState IVM.empty IM.empty M.empty emptyTidyEnv Nothing environment [] ASTState {..} = execState -- cgit v1.2.3