Bump haskell-src-exts to 1.18

9 files changed, 38 insertions, 34 deletions

diff --git a/lib/Language/Haskell/Stylish/Align.hs b/lib/Language/Haskell/Stylish/Align.hs
index c58b133..3d4a428 100644
--- a/lib/Language/Haskell/Stylish/Align.hs
+++ b/lib/Language/Haskell/Stylish/Align.hs
@@ -9,7 +9,7 @@ module Language.Haskell.Stylish.Align
 --------------------------------------------------------------------------------
 import           Data.Char                       (isSpace)
 import           Data.List                       (nub)
-import qualified Language.Haskell.Exts.Annotated as H
+import qualified Language.Haskell.Exts           as H
 
 
 --------------------------------------------------------------------------------
diff --git a/lib/Language/Haskell/Stylish/Block.hs b/lib/Language/Haskell/Stylish/Block.hs
index d4cca7d..46111ee 100644
--- a/lib/Language/Haskell/Stylish/Block.hs
+++ b/lib/Language/Haskell/Stylish/Block.hs
@@ -15,9 +15,9 @@ module Language.Haskell.Stylish.Block
 
 
 --------------------------------------------------------------------------------
-import           Control.Arrow                   (arr, (&&&), (>>>))
-import qualified Data.IntSet                     as IS
-import qualified Language.Haskell.Exts.Annotated as H
+import           Control.Arrow         (arr, (&&&), (>>>))
+import qualified Data.IntSet           as IS
+import qualified Language.Haskell.Exts as H
 
 
 --------------------------------------------------------------------------------
diff --git a/lib/Language/Haskell/Stylish/Parse.hs b/lib/Language/Haskell/Stylish/Parse.hs
index 2b16b30..d1e10b4 100644
--- a/lib/Language/Haskell/Stylish/Parse.hs
+++ b/lib/Language/Haskell/Stylish/Parse.hs
@@ -5,14 +5,16 @@ module Language.Haskell.Stylish.Parse
 
 
 --------------------------------------------------------------------------------
+import           Data.List                       (isPrefixOf, nub)
 import           Data.Maybe                      (fromMaybe, listToMaybe)
-import qualified Language.Haskell.Exts.Annotated as H
-import Data.List (isPrefixOf, nub)
+import qualified Language.Haskell.Exts           as H
+
 
 --------------------------------------------------------------------------------
 import           Language.Haskell.Stylish.Config
 import           Language.Haskell.Stylish.Step
 
+
 --------------------------------------------------------------------------------
 -- | Syntax-related language extensions are always enabled for parsing. Since we
 -- can't authoritatively know which extensions are enabled at compile-time, we
diff --git a/lib/Language/Haskell/Stylish/Step.hs b/lib/Language/Haskell/Stylish/Step.hs
index f053f8b..e5f3424 100644
--- a/lib/Language/Haskell/Stylish/Step.hs
+++ b/lib/Language/Haskell/Stylish/Step.hs
@@ -8,7 +8,7 @@ module Language.Haskell.Stylish.Step
 
 
 --------------------------------------------------------------------------------
-import qualified Language.Haskell.Exts.Annotated as H
+import qualified Language.Haskell.Exts as H
 
 
 --------------------------------------------------------------------------------
diff --git a/lib/Language/Haskell/Stylish/Step/Imports.hs b/lib/Language/Haskell/Stylish/Step/Imports.hs
index 82ba96f..ac84933 100644
--- a/lib/Language/Haskell/Stylish/Step/Imports.hs
+++ b/lib/Language/Haskell/Stylish/Step/Imports.hs
@@ -15,7 +15,7 @@ import           Data.Char                       (toLower)
 import           Data.List                       (intercalate, sortBy)
 import           Data.Maybe                      (isJust, maybeToList)
 import           Data.Ord                        (comparing)
-import qualified Language.Haskell.Exts.Annotated as H
+import qualified Language.Haskell.Exts           as H
 
 
 --------------------------------------------------------------------------------
@@ -83,8 +83,8 @@ compareImportSpecs :: H.ImportSpec l -> H.ImportSpec l -> Ordering
 compareImportSpecs = comparing key
   where
     key :: H.ImportSpec l -> (Int, Bool, String)
-    key (H.IVar _ x)       = (1, isOperator x, nameToString x)
-    key (H.IAbs _ _ x)         = (0, False, nameToString x)
+    key (H.IVar _ x)         = (1, isOperator x, nameToString x)
+    key (H.IAbs _ _ x)       = (0, False, nameToString x)
     key (H.IThingAll _ x)    = (0, False, nameToString x)
     key (H.IThingWith _ x _) = (0, False, nameToString x)
 
@@ -138,10 +138,10 @@ prettyImport :: (Ord l, Show l) =>
     Int -> Align -> Bool -> Bool -> Int -> H.ImportDecl l -> [String]
 prettyImport columns Align{..} padQualified padName longest imp =
     case longListAlign of
-        Inline -> inlineWrap
-        InlineWithBreak -> longListWrapper inlineWrap inlineWithBreakWrap
+        Inline            -> inlineWrap
+        InlineWithBreak   -> longListWrapper inlineWrap inlineWithBreakWrap
         InlineToMultiline -> longListWrapper inlineWrap inlineToMultilineWrap
-        Multiline -> longListWrapper inlineWrap multilineWrap
+        Multiline         -> longListWrapper inlineWrap multilineWrap
   where
     longListWrapper shortWrap longWrap
         | listAlign == NewLine
diff --git a/lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs b/lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs
index 0239736..c63d90a 100644
--- a/lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs
+++ b/lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs
@@ -10,14 +10,14 @@ module Language.Haskell.Stylish.Step.LanguagePragmas
 
 --------------------------------------------------------------------------------
 import qualified Data.Set                        as S
-import qualified Language.Haskell.Exts.Annotated as H
+import qualified Language.Haskell.Exts           as H
 
 
 --------------------------------------------------------------------------------
-import Language.Haskell.Stylish.Block
-import Language.Haskell.Stylish.Editor
-import Language.Haskell.Stylish.Step
-import Language.Haskell.Stylish.Util
+import           Language.Haskell.Stylish.Block
+import           Language.Haskell.Stylish.Editor
+import           Language.Haskell.Stylish.Step
+import           Language.Haskell.Stylish.Util
 
 
 --------------------------------------------------------------------------------
diff --git a/lib/Language/Haskell/Stylish/Step/SimpleAlign.hs b/lib/Language/Haskell/Stylish/Step/SimpleAlign.hs
index c89e8a1..c83c482 100644
--- a/lib/Language/Haskell/Stylish/Step/SimpleAlign.hs
+++ b/lib/Language/Haskell/Stylish/Step/SimpleAlign.hs
@@ -9,7 +9,7 @@ module Language.Haskell.Stylish.Step.SimpleAlign
 --------------------------------------------------------------------------------
 import           Data.Data                       (Data)
 import           Data.Maybe                      (maybeToList)
-import qualified Language.Haskell.Exts.Annotated as H
+import qualified Language.Haskell.Exts           as H
 
 
 --------------------------------------------------------------------------------
diff --git a/lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs b/lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs
index 0a4438a..01e29e8 100644
--- a/lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs
+++ b/lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs
@@ -5,11 +5,12 @@ module Language.Haskell.Stylish.Step.UnicodeSyntax
 
 
 --------------------------------------------------------------------------------
-import           Data.List                           (isPrefixOf, sort)
-import           Data.Map                            (Map)
-import qualified Data.Map                            as M
-import           Data.Maybe                          (maybeToList)
-import qualified Language.Haskell.Exts.Annotated     as H
+import           Data.List                                     (isPrefixOf,
+                                                                sort)
+import           Data.Map                                      (Map)
+import qualified Data.Map                                      as M
+import           Data.Maybe                                    (maybeToList)
+import qualified Language.Haskell.Exts                         as H
 
 
 --------------------------------------------------------------------------------
diff --git a/lib/Language/Haskell/Stylish/Util.hs b/lib/Language/Haskell/Stylish/Util.hs
index ed5de91..54abef5 100644
--- a/lib/Language/Haskell/Stylish/Util.hs
+++ b/lib/Language/Haskell/Stylish/Util.hs
@@ -17,13 +17,14 @@ module Language.Haskell.Stylish.Util
 
 
 --------------------------------------------------------------------------------
-import           Control.Arrow                   ((&&&), (>>>))
-import           Data.Char                       (isAlpha)
-import           Data.Data                       (Data)
-import qualified Data.Generics                   as G
-import           Data.Maybe                      (fromMaybe, listToMaybe, maybeToList)
-import           Data.Typeable                   (cast)
-import qualified Language.Haskell.Exts.Annotated as H
+import           Control.Arrow                 ((&&&), (>>>))
+import           Data.Char                     (isAlpha)
+import           Data.Data                     (Data)
+import qualified Data.Generics                 as G
+import           Data.Maybe                    (fromMaybe, listToMaybe,
+                                                maybeToList)
+import           Data.Typeable                 (cast)
+import qualified Language.Haskell.Exts         as H
 
 
 --------------------------------------------------------------------------------
@@ -112,17 +113,17 @@ withHead f (x : xs) = f x : xs
 --------------------------------------------------------------------------------
 withLast :: (a -> a) -> [a] -> [a]
 withLast _ []       = []
-withLast f [x] = [f x]
+withLast f [x]      = [f x]
 withLast f (x : xs) = x : withLast f xs
 
 
 --------------------------------------------------------------------------------
 withInit :: (a -> a) -> [a] -> [a]
 withInit _ []       = []
-withInit _ [x] = [x]
+withInit _ [x]      = [x]
 withInit f (x : xs) = f x : withInit f xs
 
 --------------------------------------------------------------------------------
 withTail :: (a -> a) -> [a] -> [a]
-withTail _ [] = []
+withTail _ []       = []
 withTail f (x : xs) = x : map f xs