stylish-haskell 0.6.1.0 → 0.6.2.0
raw patch · 11 files changed
+45/−38 lines, 11 filesdep ~haskell-src-extsPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: haskell-src-exts
API changes (from Hackage documentation)
Files
- CHANGELOG +3/−0
- lib/Language/Haskell/Stylish/Align.hs +1/−1
- lib/Language/Haskell/Stylish/Block.hs +3/−3
- lib/Language/Haskell/Stylish/Parse.hs +4/−2
- lib/Language/Haskell/Stylish/Step.hs +1/−1
- lib/Language/Haskell/Stylish/Step/Imports.hs +6/−6
- lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs +5/−5
- lib/Language/Haskell/Stylish/Step/SimpleAlign.hs +1/−1
- lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs +6/−5
- lib/Language/Haskell/Stylish/Util.hs +11/−10
- stylish-haskell.cabal +4/−4
CHANGELOG view
@@ -1,5 +1,8 @@ # CHANGELOG +- 0.6.2.0+ * Bump `haskell-src-exts` to 1.18+ - 0.6.1.0 * Fix line patching issue in Editor
lib/Language/Haskell/Stylish/Align.hs view
@@ -9,7 +9,7 @@ -------------------------------------------------------------------------------- import Data.Char (isSpace) import Data.List (nub)-import qualified Language.Haskell.Exts.Annotated as H+import qualified Language.Haskell.Exts as H --------------------------------------------------------------------------------
lib/Language/Haskell/Stylish/Block.hs view
@@ -15,9 +15,9 @@ ---------------------------------------------------------------------------------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 --------------------------------------------------------------------------------
lib/Language/Haskell/Stylish/Parse.hs view
@@ -5,13 +5,15 @@ --------------------------------------------------------------------------------+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
lib/Language/Haskell/Stylish/Step.hs view
@@ -8,7 +8,7 @@ ---------------------------------------------------------------------------------import qualified Language.Haskell.Exts.Annotated as H+import qualified Language.Haskell.Exts as H --------------------------------------------------------------------------------
lib/Language/Haskell/Stylish/Step/Imports.hs view
@@ -15,7 +15,7 @@ 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 = 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 @@ 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
lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs view
@@ -10,14 +10,14 @@ -------------------------------------------------------------------------------- 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 --------------------------------------------------------------------------------
lib/Language/Haskell/Stylish/Step/SimpleAlign.hs view
@@ -9,7 +9,7 @@ -------------------------------------------------------------------------------- import Data.Data (Data) import Data.Maybe (maybeToList)-import qualified Language.Haskell.Exts.Annotated as H+import qualified Language.Haskell.Exts as H --------------------------------------------------------------------------------
lib/Language/Haskell/Stylish/Step/UnicodeSyntax.hs view
@@ -5,11 +5,12 @@ ---------------------------------------------------------------------------------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 --------------------------------------------------------------------------------
lib/Language/Haskell/Stylish/Util.hs view
@@ -17,13 +17,14 @@ ---------------------------------------------------------------------------------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 @@ -------------------------------------------------------------------------------- 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
stylish-haskell.cabal view
@@ -1,5 +1,5 @@ Name: stylish-haskell-Version: 0.6.1.0+Version: 0.6.2.0 Synopsis: Haskell code prettifier Homepage: https://github.com/jaspervdj/stylish-haskell License: BSD3@@ -53,7 +53,7 @@ containers >= 0.3 && < 0.6, directory >= 1.1 && < 1.3, filepath >= 1.1 && < 1.5,- haskell-src-exts >= 1.17 && < 1.18,+ haskell-src-exts >= 1.18 && < 1.19, mtl >= 2.0 && < 2.3, syb >= 0.3 && < 0.7, yaml >= 0.7 && < 0.9@@ -74,7 +74,7 @@ containers >= 0.3 && < 0.6, directory >= 1.1 && < 1.3, filepath >= 1.1 && < 1.5,- haskell-src-exts >= 1.17 && < 1.18,+ haskell-src-exts >= 1.18 && < 1.19, mtl >= 2.0 && < 2.3, syb >= 0.3 && < 0.7, yaml >= 0.7 && < 0.9@@ -120,7 +120,7 @@ containers >= 0.3 && < 0.6, directory >= 1.1 && < 1.3, filepath >= 1.1 && < 1.5,- haskell-src-exts >= 1.17 && < 1.18,+ haskell-src-exts >= 1.18 && < 1.19, mtl >= 2.0 && < 2.3, syb >= 0.3 && < 0.7, yaml >= 0.7 && < 0.9