hsimport 0.2.6.6 → 0.2.6.7

raw patch · 94 files changed

+722/−2 lines, 94 files

Files

• hsimport.cabal +9/−2
• tests/goldenFiles/ModuleTest0.hs +1/−0
• tests/goldenFiles/ModuleTest1.hs +2/−0
• tests/goldenFiles/ModuleTest10.hs +3/−0
• tests/goldenFiles/ModuleTest11.hs +4/−0
• tests/goldenFiles/ModuleTest12.hs +3/−0
• tests/goldenFiles/ModuleTest13.hs +2/−0
• tests/goldenFiles/ModuleTest14.hs +6/−0
• tests/goldenFiles/ModuleTest15.hs +7/−0
• tests/goldenFiles/ModuleTest16.hs +9/−0
• tests/goldenFiles/ModuleTest17.hs +8/−0
• tests/goldenFiles/ModuleTest18.hs +12/−0
• tests/goldenFiles/ModuleTest19.hs +14/−0
• tests/goldenFiles/ModuleTest2.hs +4/−0
• tests/goldenFiles/ModuleTest20.hs +13/−0
• tests/goldenFiles/ModuleTest21.hs +16/−0
• tests/goldenFiles/ModuleTest22.hs +7/−0
• tests/goldenFiles/ModuleTest23.hs +16/−0
• tests/goldenFiles/ModuleTest24.hs +16/−0
• tests/goldenFiles/ModuleTest25.hs +16/−0
• tests/goldenFiles/ModuleTest26.hs +19/−0
• tests/goldenFiles/ModuleTest3.hs +5/−0
• tests/goldenFiles/ModuleTest4.hs +6/−0
• tests/goldenFiles/ModuleTest5.hs +9/−0
• tests/goldenFiles/ModuleTest6.hs +9/−0
• tests/goldenFiles/ModuleTest7.hs +10/−0
• tests/goldenFiles/ModuleTest8.hs +9/−0
• tests/goldenFiles/ModuleTest9.hs +9/−0
• tests/goldenFiles/SymbolTest0.hs +1/−0
• tests/goldenFiles/SymbolTest1.hs +2/−0
• tests/goldenFiles/SymbolTest10.hs +8/−0
• tests/goldenFiles/SymbolTest11.hs +8/−0
• tests/goldenFiles/SymbolTest12.hs +8/−0
• tests/goldenFiles/SymbolTest13.hs +8/−0
• tests/goldenFiles/SymbolTest14.hs +8/−0
• tests/goldenFiles/SymbolTest15.hs +8/−0
• tests/goldenFiles/SymbolTest16.hs +17/−0
• tests/goldenFiles/SymbolTest17.hs +7/−0
• tests/goldenFiles/SymbolTest18.hs +6/−0
• tests/goldenFiles/SymbolTest2.hs +4/−0
• tests/goldenFiles/SymbolTest3.hs +5/−0
• tests/goldenFiles/SymbolTest4.hs +6/−0
• tests/goldenFiles/SymbolTest5.hs +8/−0
• tests/goldenFiles/SymbolTest6.hs +8/−0
• tests/goldenFiles/SymbolTest7.hs +9/−0
• tests/goldenFiles/SymbolTest8.hs +9/−0
• tests/goldenFiles/SymbolTest9.hs +9/−0
• tests/inputFiles/ModuleTest0.hs +0/−0
• tests/inputFiles/ModuleTest1.hs +1/−0
• tests/inputFiles/ModuleTest10.hs +2/−0
• tests/inputFiles/ModuleTest11.hs +3/−0
• tests/inputFiles/ModuleTest12.hs +2/−0
• tests/inputFiles/ModuleTest13.hs +1/−0
• tests/inputFiles/ModuleTest14.hs +5/−0
• tests/inputFiles/ModuleTest15.hs +6/−0
• tests/inputFiles/ModuleTest16.hs +8/−0
• tests/inputFiles/ModuleTest17.hs +7/−0
• tests/inputFiles/ModuleTest18.hs +11/−0
• tests/inputFiles/ModuleTest19.hs +13/−0
• tests/inputFiles/ModuleTest2.hs +3/−0
• tests/inputFiles/ModuleTest20.hs +12/−0
• tests/inputFiles/ModuleTest21.hs +15/−0
• tests/inputFiles/ModuleTest22.hs +6/−0
• tests/inputFiles/ModuleTest23.hs +15/−0
• tests/inputFiles/ModuleTest24.hs +16/−0
• tests/inputFiles/ModuleTest25.hs +15/−0
• tests/inputFiles/ModuleTest26.hs +18/−0
• tests/inputFiles/ModuleTest3.hs +4/−0
• tests/inputFiles/ModuleTest4.hs +5/−0
• tests/inputFiles/ModuleTest5.hs +8/−0
• tests/inputFiles/ModuleTest6.hs +9/−0
• tests/inputFiles/ModuleTest7.hs +9/−0
• tests/inputFiles/ModuleTest8.hs +8/−0
• tests/inputFiles/ModuleTest9.hs +8/−0
• tests/inputFiles/SymbolTest0.hs +0/−0
• tests/inputFiles/SymbolTest1.hs +1/−0
• tests/inputFiles/SymbolTest10.hs +8/−0
• tests/inputFiles/SymbolTest11.hs +8/−0
• tests/inputFiles/SymbolTest12.hs +8/−0
• tests/inputFiles/SymbolTest13.hs +8/−0
• tests/inputFiles/SymbolTest14.hs +8/−0
• tests/inputFiles/SymbolTest15.hs +8/−0
• tests/inputFiles/SymbolTest16.hs +15/−0
• tests/inputFiles/SymbolTest17.hs +5/−0
• tests/inputFiles/SymbolTest18.hs +6/−0
• tests/inputFiles/SymbolTest2.hs +3/−0
• tests/inputFiles/SymbolTest3.hs +4/−0
• tests/inputFiles/SymbolTest4.hs +5/−0
• tests/inputFiles/SymbolTest5.hs +8/−0
• tests/inputFiles/SymbolTest6.hs +8/−0
• tests/inputFiles/SymbolTest7.hs +8/−0
• tests/inputFiles/SymbolTest8.hs +8/−0
• tests/inputFiles/SymbolTest9.hs +8/−0
• tests/outputFiles/.gitignore +2/−0

@@ -1,14 +1,21 @@ Name:          hsimport-Version:       0.2.6.6+Version:       0.2.6.7 License:       BSD3 License-file:  LICENSE Author:        Daniel Trstenjak Maintainer:    daniel.trstenjak@gmail.com Build-Type:    Simple Category:      Utils-Cabal-Version: >=1.8+Cabal-Version: >=1.9.2 Synopsis:      A command line program for extending the import list of a Haskell source file. Description:   A command line program for extending the import list of a Haskell source file.++-- test samples+extra-source-files:+    tests/inputFiles/*.hs+    tests/goldenFiles/*.hs+    -- to leave directory in tarball+    tests/outputFiles/.gitignore  source-repository head   type:     git

@@ -0,0 +1,1 @@+import Foo.Bar

@@ -0,0 +1,2 @@+module Test where+import Foo.Bar

@@ -0,0 +1,3 @@+import Control.Monad+f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,4 @@+import Control.Blub+import Control.Monad+f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,3 @@+{-# Language PatternGuards #-}+module Blub where+import Control.Monad

@@ -0,0 +1,2 @@+{-# Language PatternGuards #-}+import Control.Monad

@@ -0,0 +1,6 @@+module Blub+   ( blub+   , foo+   , bar+   ) where+import Control.Monad

@@ -0,0 +1,7 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Control.Monad

@@ -0,0 +1,9 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Control.Monad+f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Blub+   ( blub+   , foo+   , bar+   ) where+import Control.Monad+f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,12 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import Control.Monad+import Ugah.Blub+f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,14 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import Control.Monad+import Ugah.Blub+f :: Int -> Int+f = (+ 3)++ddd

@@ -0,0 +1,4 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh

@@ -0,0 +1,13 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import Control.Monad+import Ugah.Blub+ddd+f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,16 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import Control.Monad+import Ugah.Blub+f :: Int -> Int+f = (+ 3)++g :: Int -> Int+g =+   where

@@ -0,0 +1,7 @@+module Blub where+import qualified Language.Haskell.Exts as HS+import Control.Monad++addSymbol :: HS.ImportDecl -> String -> HS.ImportDecl+addSymbol (id@HS.ImportDecl {HS.importSpecs = specs}) symbolName =+   id {HS.importSpecs = specs & _Just . _2 %~ (++ [HS.IVar $ hsName symbolName])}

@@ -0,0 +1,16 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import qualified Control.Monad as CM+import Ugah.Blub+f :: Int -> Int+f = (+ 3)++g :: Int -> Int+g =+   where

@@ -0,0 +1,16 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import qualified Control.Monad as CM+import Ugah.Blub+f :: Int -> Int+f = (+ 3)++g :: Int -> Int+g =+   where

@@ -0,0 +1,16 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import qualified Control.Monad+import Ugah.Blub+f :: Int -> Int+f = (+ 3)++g :: Int -> Int+g =+   where

@@ -0,0 +1,19 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+#include "Foo.h"+import Ugah.Foo+import Control.Applicative+import Control.Monad+#ifdef FOO+import Ugah.Blub+#endif+f :: Int -> Int+f = (+ 3)++g :: Int -> Int+g =+   where

@@ -0,0 +1,5 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad

@@ -0,0 +1,6 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Ugah.Argh2+import Control.Monad

@@ -0,0 +1,9 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad (when)+import Control.Monad++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,9 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad (when)+import Control.Monad++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,10 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad (when)+import qualified Control.Monad as M+import Control.Monad++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,9 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad hiding (when)+import Control.Monad++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,9 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import qualified Control.Monad+import Control.Monad++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,1 @@+import Foo.Bar (foo)

@@ -0,0 +1,2 @@+module Test where+import Foo.Bar (foo)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Applicative++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Applicative (pure, (<$>))++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Applicative (pure, (<$>))++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Applicative (pure, (<$>), (<*))++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Applicative (pure, (<$>), (<*))++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Applicative (pure, (<$>), (<*), (*>))++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,17 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import qualified Control.Monad as CM+import Control.Monad (when)+import Ugah.Blub+f :: Int -> Int+f = (+ 3)++g :: Int -> Int+g =+   where

@@ -0,0 +1,7 @@+module Blub+   ( blub+   , foo+   , bar+   ) where+import Control.Monad (when)+import qualified Control.Monad as CM

@@ -0,0 +1,6 @@+module Blub+   ( blub+   , foo+   , bar+   ) where+import Data.Text (Text)

@@ -0,0 +1,4 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub (foo)+import Ugah.Argh

@@ -0,0 +1,5 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad (when)

@@ -0,0 +1,6 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Ugah.Argh2 (argh)+import Control.Monad

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad (when, unless)++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,9 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import qualified Control.Monad as M+import Control.Monad (unless)++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,9 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad hiding (when)+import Control.Monad (unless)++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,9 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import qualified Control.Monad+import Control.Monad (unless)++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,1 @@+module Test where

@@ -0,0 +1,2 @@+f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,3 @@+import Control.Blub+f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,2 @@+{-# Language PatternGuards #-}+module Blub where

@@ -0,0 +1,1 @@+{-# Language PatternGuards #-}

@@ -0,0 +1,5 @@+module Blub+   ( blub+   , foo+   , bar+   ) where

@@ -0,0 +1,6 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where

@@ -0,0 +1,8 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,7 @@+module Blub+   ( blub+   , foo+   , bar+   ) where+f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,11 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import Ugah.Blub+f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,13 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import Ugah.Blub+f :: Int -> Int+f = (+ 3)++ddd

@@ -0,0 +1,3 @@+module Test where+import Foo.Bar+import Ugah.Argh

@@ -0,0 +1,12 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import Ugah.Blub+ddd+f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,15 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import Ugah.Blub+f :: Int -> Int+f = (+ 3)++g :: Int -> Int+g =+   where

@@ -0,0 +1,6 @@+module Blub where+import qualified Language.Haskell.Exts as HS++addSymbol :: HS.ImportDecl -> String -> HS.ImportDecl+addSymbol (id@HS.ImportDecl {HS.importSpecs = specs}) symbolName =+   id {HS.importSpecs = specs & _Just . _2 %~ (++ [HS.IVar $ hsName symbolName])}

@@ -0,0 +1,15 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import Ugah.Blub+f :: Int -> Int+f = (+ 3)++g :: Int -> Int+g =+   where

@@ -0,0 +1,16 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import qualified Control.Monad as CM+import Ugah.Blub+f :: Int -> Int+f = (+ 3)++g :: Int -> Int+g =+   where

@@ -0,0 +1,15 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import Ugah.Blub+f :: Int -> Int+f = (+ 3)++g :: Int -> Int+g =+   where

@@ -0,0 +1,18 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+#include "Foo.h"+import Ugah.Foo+import Control.Applicative+#ifdef FOO+import Ugah.Blub+#endif+f :: Int -> Int+f = (+ 3)++g :: Int -> Int+g =+   where

@@ -0,0 +1,4 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh

@@ -0,0 +1,5 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad (when)++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,9 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad (when)+import Control.Monad++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,9 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad (when)+import qualified Control.Monad as M++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad hiding (when)++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import qualified Control.Monad++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,1 @@+module Test where

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Applicative++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Applicative (pure)++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Applicative (pure, (<$>))++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Applicative (pure, (<$>))++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Applicative (pure, (<$>), (<*))++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Applicative (pure, (<$>), (<*))++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,15 @@+{-# Language PatternGuards #-}+module Blub+   ( blub+   , foo+   , bar+   ) where+import Ugah.Foo+import Control.Applicative+import Ugah.Blub+f :: Int -> Int+f = (+ 3)++g :: Int -> Int+g =+   where

@@ -0,0 +1,5 @@+module Blub+   ( blub+   , foo+   , bar+   ) where

@@ -0,0 +1,6 @@+module Blub+   ( blub+   , foo+   , bar+   ) where+import Data.Text (Text)

@@ -0,0 +1,3 @@+module Test where+import Foo.Bar+import Ugah.Argh

@@ -0,0 +1,4 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh

@@ -0,0 +1,5 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad (when)++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import qualified Control.Monad as M++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import Control.Monad hiding (when)++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,8 @@+module Test where+import Foo.Bar+import Foo.Bar.Blub+import Ugah.Argh+import qualified Control.Monad++f :: Int -> Int+f = (+ 3)

@@ -0,0 +1,2 @@+*+!.gitignore