fix-imports 1.0.3 → 1.0.4

raw patch · 3 files changed

+18/−7 lines, 3 filesdep ~haskell-src-exts

Dependency ranges changed: haskell-src-exts

Files

• fix-imports.cabal +7/−3
• src/FixImports.hs +10/−3
• src/Util.hs +1/−1

@@ -1,5 +1,5 @@ name: fix-imports-version: 1.0.3+version: 1.0.4 cabal-version: >= 1.6 build-type: Simple synopsis: Program to manage the imports of a haskell module@@ -13,6 +13,10 @@     It's most convenient if bound to an editor key.     .     Recent major changes:+    * version 1.0.3 and 1.0.4+    .+    * upgrade to haskell-src-exts-1.16+    .     * version 1.0.2     .     * Fix bug where a qualified import with >1 dot wasn't found.  And don't@@ -51,12 +55,12 @@  source-repository head     type: darcs-    location: http://ofb.net/~elaforge/darcs/fix-imports/+    location: http://hub.darcs.net/elaforge/fix-imports  executable fix-imports     main-is: Main.hs     hs-source-dirs: src     build-depends: base >= 3 && < 5, containers, directory, filepath, process-        , haskell-src-exts >= 1.14.0 && < 1.15+        , haskell-src-exts >= 1.16.0 && < 1.17         , uniplate, split, cpphs, text     ghc-options: -Wall -fno-warn-name-shadowing

@@ -228,9 +228,16 @@         Nothing -> Nothing         Just (mod, local) -> Just (Types.ImportLine (mkImport mod) [] local)     where-    mkImport (Types.ModuleName mod) =-        Haskell.ImportDecl empty (Haskell.ModuleName empty mod)-            True False Nothing (importAs mod) Nothing+    mkImport (Types.ModuleName mod) = Haskell.ImportDecl+        { Haskell.importAnn = empty+        , Haskell.importModule = Haskell.ModuleName empty mod+        , Haskell.importQualified = True+        , Haskell.importSrc = False+        , Haskell.importSafe = False+        , Haskell.importPkg = Nothing+        , Haskell.importAs = importAs mod+        , Haskell.importSpecs = Nothing+        }     importAs mod         | name == mod = Nothing         | otherwise = Just $ Haskell.ModuleName empty name

@@ -1,5 +1,5 @@ module Util where-import Prelude hiding (head)+import Prelude hiding (head, join) import qualified Control.Concurrent as Concurrent import qualified Control.Concurrent.MVar as MVar import qualified Control.Exception as Exception