Merge pull request #296 from edwtjo/nixos-fixes

NixOS fixes
This commit is contained in:
Andrew Gibiansky 2014-10-25 23:41:00 -07:00
commit 368ccb84e0
2 changed files with 3 additions and 3 deletions

View File

@ -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.

View File

@ -4,7 +4,7 @@
module Main where
-- Prelude imports.
import ClassyPrelude hiding (last, liftIO)
import ClassyPrelude hiding (last, liftIO, readChan, writeChan)
import Prelude (last, read)
-- Standard library imports.