summary refs log tree commit diff
path: root/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch
blob: b2c1362b62fa0dc0a466be56bc48b41e157b20c2 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
From fad4e38079e91b13bf1e94732b7494504071b224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 28 Sep 2014 09:27:40 +0200
Subject: [PATCH] catMaybes, explicitly use ClassyPrelude

---
 src/IHaskell/Eval/Completion.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/IHaskell/Eval/Completion.hs b/src/IHaskell/Eval/Completion.hs
index 790c903..93d7ac1 100644
--- a/src/IHaskell/Eval/Completion.hs
+++ b/src/IHaskell/Eval/Completion.hs
@@ -141,7 +141,7 @@ getTrueModuleName name = do
       onlyImportDecl _ = Nothing
 
   -- Get all imports that we use.
-  imports <- catMaybes <$> map onlyImportDecl <$> getContext
+  imports <- ClassyPrelude.catMaybes <$> map onlyImportDecl <$> getContext
 
   -- Find the ones that have a qualified name attached.
   -- If this name isn't one of them, it already is the true name.
@@ -178,7 +178,7 @@ completionType line loc target
     = Empty
 
   -- When in a string, complete filenames.
-  | cursorInString line loc 
+  | cursorInString line loc
     = FilePath (getStringTarget lineUpToCursor) (getStringTarget lineUpToCursor)
 
   -- Complete module names in imports and elsewhere.
-- 
2.1.0