at 15.09-beta 34 lines 1.2 kB view raw
1From fad4e38079e91b13bf1e94732b7494504071b224 Mon Sep 17 00:00:00 2001 2From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc> 3Date: Sun, 28 Sep 2014 09:27:40 +0200 4Subject: [PATCH] catMaybes, explicitly use ClassyPrelude 5 6--- 7 src/IHaskell/Eval/Completion.hs | 4 ++-- 8 1 file changed, 2 insertions(+), 2 deletions(-) 9 10diff --git a/src/IHaskell/Eval/Completion.hs b/src/IHaskell/Eval/Completion.hs 11index 790c903..93d7ac1 100644 12--- a/src/IHaskell/Eval/Completion.hs 13+++ b/src/IHaskell/Eval/Completion.hs 14@@ -141,7 +141,7 @@ getTrueModuleName name = do 15 onlyImportDecl _ = Nothing 16 17 -- Get all imports that we use. 18- imports <- catMaybes <$> map onlyImportDecl <$> getContext 19+ imports <- ClassyPrelude.catMaybes <$> map onlyImportDecl <$> getContext 20 21 -- Find the ones that have a qualified name attached. 22 -- If this name isn't one of them, it already is the true name. 23@@ -178,7 +178,7 @@ completionType line loc target 24 = Empty 25 26 -- When in a string, complete filenames. 27- | cursorInString line loc 28+ | cursorInString line loc 29 = FilePath (getStringTarget lineUpToCursor) (getStringTarget lineUpToCursor) 30 31 -- Complete module names in imports and elsewhere. 32-- 332.1.0 34