Update .stylish-haskell

.stylish-haskell.yaml

@@ -15,6 +15,14 @@ steps:
   #     # true.
   #     add_language_pragma: true
 
+  # Align the right hand side of some elements.  This is quite conservative
+  # and only applies to statements where each element occupies a single
+  # line.
+  - simple_align:
+      cases: false
+      top_level_patterns: false
+      records: false
+
   # Import cleanup
   - imports:
       # There are different ways we can align names and lists.
@@ -33,6 +41,91 @@ steps:
       # Default: global.
       align: global
 
+      # Folowing options affect only import list alignment.
+      #
+      # List align has following options:
+      #
+      # - after_alias: Import list is aligned with end of import including
+      #   'as' and 'hiding' keywords.
+      #
+      #   > import qualified Data.List      as List (concat, foldl, foldr, head,
+      #   >                                          init, last, length)
+      #
+      # - with_alias: Import list is aligned with start of alias or hiding.
+      #
+      #   > import qualified Data.List      as List (concat, foldl, foldr, head,
+      #   >                                 init, last, length)
+      #
+      # - new_line: Import list starts always on new line.
+      #
+      #   > import qualified Data.List      as List
+      #   >     (concat, foldl, foldr, head, init, last, length)
+      #
+      # Default: after_alias
+      list_align: new_line
+
+      # Long list align style takes effect when import is too long. This is
+      # determined by 'columns' setting.
+      #
+      # - inline: This option will put as much specs on same line as possible.
+      #
+      # - new_line: Import list will start on new line.
+      #
+      # - new_line_multiline: Import list will start on new line when it's
+      #   short enough to fit to single line. Otherwise it'll be multiline.
+      #
+      # - multiline: One line per import list entry.
+      #   Type with contructor list acts like single import.
+      #
+      #   > import qualified Data.Map as M
+      #   >     ( empty
+      #   >     , singleton
+      #   >     , ...
+      #   >     , delete
+      #   >     )
+      #
+      # Default: inline
+      long_list_align: new_line
+
+      # Align empty list (importing instances)
+      #
+      # Empty list align has following options
+      #
+      # - inherit: inherit list_align setting
+      #
+      # - right_after: () is right after the module name:
+      #
+      #   > import Vector.Instances ()
+      #
+      # Default: inherit
+      empty_list_align: right_after
+
+      # List padding determines indentation of import list on lines after import.
+      # This option affects 'long_list_align'.
+      #
+      # - <integer>: constant value
+      #
+      # - module_name: align under start of module name.
+      #   Useful for 'file' and 'group' align settings.
+      list_padding: module_name
+
+      # Separate lists option affects formating of import list for type
+      # or class. The only difference is single space between type and list
+      # of constructors, selectors and class functions.
+      #
+      # - true: There is single space between Foldable type and list of it's
+      #   functions.
+      #
+      #   > import Data.Foldable (Foldable (fold, foldl, foldMap))
+      #
+      # - false: There is no space between Foldable type and list of it's
+      #   functions.
+      #
+      #   > import Data.Foldable (Foldable(fold, foldl, foldMap))
+      #
+      # Default: true
+      separate_lists: true
+
   # Language pragmas
   - language_pragmas:
       # We can generate different styles of language pragma lists.
@@ -47,13 +140,20 @@ steps:
       # Default: vertical.
       style: vertical
 
+      # Align affects alignment of closing pragma brackets.
+      #
+      # - true: Brackets are aligned in same collumn.
+      #
+      # - false: Brackets are not aligned together. There is only one space
+      #   between actual import and closing bracket.
+      #
+      # Default: true
+      align: true
+
       # stylish-haskell can detect redundancy of some language pragmas. If this
       # is set to true, it will remove those redundant pragmas. Default: true.
       remove_redundant: true
 
-  # Align the types in record declarations
-  - records: {}
-
   # Replace tabs by spaces. This is disabled by default.
   # - tabs:
   #     # Number of spaces to use for each tab. Default: 8, as specified by the
@@ -67,11 +167,24 @@ steps:
 # to. Different steps take this into account. Default: 80.
 columns: 80
 
+# By default, line endings are converted according to the OS. You can override
+# preferred format here.
+#
+# - native: Native newline format. CRLF on Windows, LF on other OSes.
+#
+# - lf: Convert to LF ("\n").
+#
+# - crlf: Convert to CRLF ("\r\n").
+#
+# Default: native.
+newline: lf
+
 # Sometimes, language extensions are specified in a cabal file or from the
 # command line instead of using language pragmas in the file. stylish-haskell
 # needs to be aware of these, so it can parse the file correctly.
 #
 # No language extensions are enabled by default.
 language_extensions:
-    - TemplateHaskell
-    - QuasiQuotes
+  - FlexibleContexts
+  - TemplateHaskell
+  - QuasiQuotes

servant/src/Servant/API.hs

@@ -66,71 +66,75 @@ module Servant.API (
   -- * Utilities
   module Servant.Utils.Links,
   -- | Type-safe internal URIs
-  
+
   -- * Re-exports
   If,
   SBool (..), SBoolI (..)
   ) where
 
-import           Servant.API.Alternative     ((:<|>) (..))
-import           Servant.API.BasicAuth       (BasicAuth,BasicAuthData(..))
-import           Servant.API.Capture         (Capture, Capture', CaptureAll)
-import           Servant.API.ContentTypes    (Accept (..), FormUrlEncoded,
-                                              JSON,
-                                              MimeRender (..), NoContent (NoContent),
-                                              MimeUnrender (..), OctetStream,
-                                              PlainText)
-import           Servant.API.Description     (Description, Summary)
-import           Servant.API.Empty           (EmptyAPI (..))
-import           Servant.API.Experimental.Auth (AuthProtect)
-import           Servant.API.Header          (Header, Header')
-import           Servant.API.HttpVersion     (HttpVersion (..))
-import           Servant.API.IsSecure        (IsSecure (..))
-import           Servant.API.Modifiers       (Required,  Optional, Lenient, Strict)
-import           Servant.API.QueryParam      (QueryFlag, QueryParam, QueryParam',
-                                              QueryParams)
-import           Servant.API.Raw             (Raw)
-import           Servant.API.Stream          (Stream, StreamGet, StreamPost,
-                                              StreamGenerator (..),
-                                              ToStreamGenerator (..),
-                                              ResultStream(..), BuildFromStream (..),
-                                              ByteStringParser (..),
-                                              FramingRender (..), BoundaryStrategy (..),
-                                              FramingUnrender (..),
-                                              NewlineFraming,
-                                              NetstringFraming)
-import           Servant.API.RemoteHost      (RemoteHost)
-import           Servant.API.ReqBody         (ReqBody, ReqBody')
-import           Servant.API.ResponseHeaders (AddHeader, addHeader, noHeader,
-                                              BuildHeadersTo (buildHeadersTo),
-                                              GetHeaders (getHeaders),
-                                              HList (..), Headers (..),
-                                              getHeadersHList, getResponse, ResponseHeader (..))
-import           Servant.API.Sub             ((:>))
-import           Servant.API.Vault           (Vault)
-import           Servant.API.Verbs           (PostCreated, Delete, DeleteAccepted,
-                                              DeleteNoContent,
-                                              DeleteNonAuthoritative, Get,
-                                              GetAccepted, GetNoContent,
-                                              GetNonAuthoritative,
-                                              GetPartialContent,
-                                              GetResetContent,
-                                              Patch,
-                                              PatchAccepted, PatchNoContent,
-                                              PatchNoContent,
-                                              PatchNonAuthoritative, Post,
-                                              PostAccepted, PostNoContent,
-                                              PostNonAuthoritative,
-                                              PostResetContent, Put,
-                                              PutAccepted, PutNoContent,
-                                              PutNoContent, PutNonAuthoritative,
-                                              ReflectMethod (reflectMethod),
-                                              Verb, StdMethod(..))
-import           Servant.API.WithNamedContext (WithNamedContext)
-import           Servant.Utils.Links         (HasLink (..), Link, IsElem, IsElem',
-                                              URI (..), safeLink)
-import           Web.HttpApiData             (FromHttpApiData (..),
-                                              ToHttpApiData (..))
-
-import           Data.Type.Bool              (If)
-import           Data.Singletons.Bool        (SBool (..), SBoolI (..))
+import           Data.Singletons.Bool
+                 (SBool (..), SBoolI (..))
+import           Data.Type.Bool
+                 (If)
+import           Servant.API.Alternative
+                 ((:<|>) (..))
+import           Servant.API.BasicAuth
+                 (BasicAuth, BasicAuthData (..))
+import           Servant.API.Capture
+                 (Capture, Capture', CaptureAll)
+import           Servant.API.ContentTypes
+                 (Accept (..), FormUrlEncoded, JSON, MimeRender (..),
+                 MimeUnrender (..), NoContent (NoContent), OctetStream,
+                 PlainText)
+import           Servant.API.Description
+                 (Description, Summary)
+import           Servant.API.Empty
+                 (EmptyAPI (..))
+import           Servant.API.Experimental.Auth
+                 (AuthProtect)
+import           Servant.API.Header
+                 (Header, Header')
+import           Servant.API.HttpVersion
+                 (HttpVersion (..))
+import           Servant.API.IsSecure
+                 (IsSecure (..))
+import           Servant.API.Modifiers
+                 (Lenient, Optional, Required, Strict)
+import           Servant.API.QueryParam
+                 (QueryFlag, QueryParam, QueryParam', QueryParams)
+import           Servant.API.Raw
+                 (Raw)
+import           Servant.API.RemoteHost
+                 (RemoteHost)
+import           Servant.API.ReqBody
+                 (ReqBody, ReqBody')
+import           Servant.API.ResponseHeaders
+                 (AddHeader, BuildHeadersTo (buildHeadersTo),
+                 GetHeaders (getHeaders), HList (..), Headers (..),
+                 ResponseHeader (..), addHeader, getHeadersHList, getResponse,
+                 noHeader)
+import           Servant.API.Stream
+                 (BoundaryStrategy (..), BuildFromStream (..),
+                 ByteStringParser (..), FramingRender (..),
+                 FramingUnrender (..), NetstringFraming, NewlineFraming,
+                 ResultStream (..), Stream, StreamGenerator (..), StreamGet,
+                 StreamPost, ToStreamGenerator (..))
+import           Servant.API.Sub
+                 ((:>))
+import           Servant.API.Vault
+                 (Vault)
+import           Servant.API.Verbs
+                 (Delete, DeleteAccepted, DeleteNoContent,
+                 DeleteNonAuthoritative, Get, GetAccepted, GetNoContent,
+                 GetNonAuthoritative, GetPartialContent, GetResetContent,
+                 Patch, PatchAccepted, PatchNoContent, PatchNonAuthoritative,
+                 Post, PostAccepted, PostCreated, PostNoContent,
+                 PostNonAuthoritative, PostResetContent, Put, PutAccepted,
+                 PutNoContent, PutNonAuthoritative,
+                 ReflectMethod (reflectMethod), StdMethod (..), Verb)
+import           Servant.API.WithNamedContext
+                 (WithNamedContext)
+import           Servant.Utils.Links
+                 (HasLink (..), IsElem, IsElem', Link, URI (..), safeLink)
+import           Web.HttpApiData
+                 (FromHttpApiData (..), ToHttpApiData (..))

servant/src/Servant/API/Alternative.hs

@@ -1,14 +1,16 @@
 {-# LANGUAGE CPP                #-}
 {-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE DeriveFunctor      #-}
 {-# LANGUAGE DeriveFoldable     #-}
+{-# LANGUAGE DeriveFunctor      #-}
 {-# LANGUAGE DeriveTraversable  #-}
 {-# LANGUAGE TypeOperators      #-}
 {-# OPTIONS_HADDOCK not-home    #-}
 module Servant.API.Alternative ((:<|>)(..)) where
 
-import           Data.Semigroup   (Semigroup (..))
-import           Data.Typeable    (Typeable)
+import           Data.Semigroup
+                 (Semigroup (..))
+import           Data.Typeable
+                 (Typeable)
 import           Prelude ()
 import           Prelude.Compat
 

servant/src/Servant/API/BasicAuth.hs

@@ -1,13 +1,16 @@
-{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DataKinds          #-}
 {-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE KindSignatures #-}
-{-# LANGUAGE PolyKinds #-}
+{-# LANGUAGE KindSignatures     #-}
+{-# LANGUAGE PolyKinds          #-}
 
 module Servant.API.BasicAuth where
 
-import           Data.ByteString (ByteString)
-import           Data.Typeable (Typeable)
-import           GHC.TypeLits (Symbol)
+import           Data.ByteString
+                 (ByteString)
+import           Data.Typeable
+                 (Typeable)
+import           GHC.TypeLits
+                 (Symbol)
 
 
 -- | Combinator for <https://tools.ietf.org/html/rfc2617#section-2 Basic Access Authentication>.

servant/src/Servant/API/Capture.hs

@@ -4,8 +4,10 @@
 {-# OPTIONS_HADDOCK not-home    #-}
 module Servant.API.Capture (Capture, Capture', CaptureAll) where
 
-import           Data.Typeable (Typeable)
-import           GHC.TypeLits  (Symbol)
+import           Data.Typeable
+                 (Typeable)
+import           GHC.TypeLits
+                 (Symbol)
 -- | Capture a value from the request path under a certain type @a@.
 --
 -- Example: