REF apply latest stylish formatting

This commit is contained in:
Nathan Dwarshuis 2021-06-19 00:54:01 -04:00
parent dd4f45f61c
commit 7f62b27a5a
11 changed files with 119 additions and 26 deletions

View File

@ -15,16 +15,91 @@ steps:
# # true. # # true.
# add_language_pragma: true # add_language_pragma: true
# Format record definitions # Format module header
- records: {} #
# Currently, this option is not configurable and will format all exports and
# module declarations to minimize diffs
#
# - module_header:
# # How many spaces use for indentation in the module header.
# indent: 4
#
# # Should export lists be sorted? Sorting is only performed within the
# # export section, as delineated by Haddock comments.
# sort: true
#
# # See `separate_lists` for the `imports` step.
# separate_lists: true
# Format record definitions. This is disabled by default.
#
# You can control the layout of record fields. The only rules that can't be configured
# are these:
#
# - "|" is always aligned with "="
# - "," in fields is always aligned with "{"
# - "}" is likewise always aligned with "{"
#
# - records:
# # How to format equals sign between type constructor and data constructor.
# # Possible values:
# # - "same_line" -- leave "=" AND data constructor on the same line as the type constructor.
# # - "indent N" -- insert a new line and N spaces from the beginning of the next line.
# equals: "indent 2"
#
# # How to format first field of each record constructor.
# # Possible values:
# # - "same_line" -- "{" and first field goes on the same line as the data constructor.
# # - "indent N" -- insert a new line and N spaces from the beginning of the data constructor
# first_field: "indent 2"
#
# # How many spaces to insert between the column with "," and the beginning of the comment in the next line.
# field_comment: 2
#
# # How many spaces to insert before "deriving" clause. Deriving clauses are always on separate lines.
# deriving: 2
#
# # How many spaces to insert before "via" clause counted from indentation of deriving clause
# # Possible values:
# # - "same_line" -- "via" part goes on the same line as "deriving" keyword.
# # - "indent N" -- insert a new line and N spaces from the beginning of "deriving" keyword.
# via: "indent 2"
#
# # Sort typeclass names in the "deriving" list alphabetically.
# sort_deriving: true
#
# # Wheter or not to break enums onto several lines
# #
# # Default: false
# break_enums: false
#
# # Whether or not to break single constructor data types before `=` sign
# #
# # Default: true
# break_single_constructors: true
#
# # Whether or not to curry constraints on function.
# #
# # E.g: @allValues :: Enum a => Bounded a => Proxy a -> [a]@
# #
# # Instead of @allValues :: (Enum a, Bounded a) => Proxy a -> [a]@
# #
# # Default: false
# curried_context: false
# Align the right hand side of some elements. This is quite conservative # Align the right hand side of some elements. This is quite conservative
# and only applies to statements where each element occupies a single # and only applies to statements where each element occupies a single
# line. All default to true. # line.
# Possible values:
# - always - Always align statements.
# - adjacent - Align statements that are on adjacent lines in groups.
# - never - Never align statements.
# All default to always.
- simple_align: - simple_align:
cases: true cases: always
top_level_patterns: true top_level_patterns: always
records: true records: always
multi_way_if: always
# Import cleanup # Import cleanup
- imports: - imports:
@ -76,6 +151,11 @@ steps:
# > import qualified Data.List as List # > import qualified Data.List as List
# > (concat, foldl, foldr, head, init, last, length) # > (concat, foldl, foldr, head, init, last, length)
# #
# - repeat: Repeat the module name to align the import list.
#
# > import qualified Data.List as List (concat, foldl, foldr, head)
# > import qualified Data.List as List (init, last, length)
#
# Default: after_alias # Default: after_alias
list_align: after_alias list_align: after_alias
@ -178,6 +258,22 @@ steps:
# Default: false # Default: false
space_surround: false space_surround: false
# Enabling this argument will use the new GHC lib parse to format imports.
#
# This currently assumes a few things, it will assume that you want post
# qualified imports. It is also not as feature complete as the old
# imports formatting.
#
# It does not remove redundant lines or merge lines. As such, the full
# feature scope is still pending.
#
# It _is_ however, a fine alternative if you are using features that are
# not parseable by haskell src extensions and you're comfortable with the
# presets.
#
# Default: false
ghc_lib_parser: false
# Language pragmas # Language pragmas
- language_pragmas: - language_pragmas:
# We can generate different styles of language pragma lists. # We can generate different styles of language pragma lists.
@ -225,9 +321,6 @@ steps:
# simple_align but is a bit less conservative. # simple_align but is a bit less conservative.
# - squash: {} # - squash: {}
# A common indentation setting. Different steps take this into account.
indent: 4
# A common setting is the number of columns (parts of) code will be wrapped # A common setting is the number of columns (parts of) code will be wrapped
# to. Different steps take this into account. # to. Different steps take this into account.
# #

View File

@ -19,10 +19,10 @@ import Xmobar.Plugins.IntelBacklight
import Xmobar.Plugins.Screensaver import Xmobar.Plugins.Screensaver
import Xmobar.Plugins.VPN import Xmobar.Plugins.VPN
import Xmobar
import XMonad (getXMonadDir) import XMonad (getXMonadDir)
import XMonad.Hooks.DynamicLog (wrap, xmobarColor) import XMonad.Hooks.DynamicLog (wrap, xmobarColor)
import qualified XMonad.Internal.Theme as T import qualified XMonad.Internal.Theme as T
import Xmobar
sep :: String sep :: String
sep = xmobarColor T.backdropFgColor "" " : " sep = xmobarColor T.backdropFgColor "" " : "

View File

@ -37,8 +37,8 @@ import XMonad.Hooks.DynamicLog
import XMonad.Hooks.EwmhDesktops import XMonad.Hooks.EwmhDesktops
import XMonad.Hooks.ManageDocks import XMonad.Hooks.ManageDocks
import XMonad.Hooks.ManageHelpers import XMonad.Hooks.ManageHelpers
import XMonad.Internal.Command.Desktop
import XMonad.Internal.Command.DMenu import XMonad.Internal.Command.DMenu
import XMonad.Internal.Command.Desktop
import XMonad.Internal.Command.Power import XMonad.Internal.Command.Power
import XMonad.Internal.Concurrent.ACPIEvent import XMonad.Internal.Concurrent.ACPIEvent
import XMonad.Internal.Concurrent.ClientMessage import XMonad.Internal.Concurrent.ClientMessage
@ -57,8 +57,8 @@ import XMonad.Layout.Tabbed
import qualified XMonad.Operations as O import qualified XMonad.Operations as O
import qualified XMonad.StackSet as W import qualified XMonad.StackSet as W
import XMonad.Util.Cursor import XMonad.Util.Cursor
import qualified XMonad.Util.ExtensibleState as E
import XMonad.Util.EZConfig import XMonad.Util.EZConfig
import qualified XMonad.Util.ExtensibleState as E
import XMonad.Util.NamedActions import XMonad.Util.NamedActions
import XMonad.Util.WorkspaceCompare import XMonad.Util.WorkspaceCompare

View File

@ -17,8 +17,8 @@ import Control.Monad.Reader
import Graphics.X11.Types import Graphics.X11.Types
import System.Directory (XdgDirectory (..), getXdgDirectory)
import System.IO import System.IO
import System.Directory (getXdgDirectory, XdgDirectory(..))
import XMonad.Core hiding (spawn) import XMonad.Core hiding (spawn)
import XMonad.Internal.Process import XMonad.Internal.Process

View File

@ -23,8 +23,8 @@ import System.IO.Streams.UnixSocket
import XMonad.Core import XMonad.Core
import XMonad.Internal.Command.Power import XMonad.Internal.Command.Power
import XMonad.Internal.Shell
import XMonad.Internal.Concurrent.ClientMessage import XMonad.Internal.Concurrent.ClientMessage
import XMonad.Internal.Shell
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
-- | Data structure to hold the ACPI events I care about -- | Data structure to hold the ACPI events I care about

View File

@ -15,8 +15,8 @@ import Control.Monad (void)
import DBus import DBus
import DBus.Client import DBus.Client
import Graphics.X11.Xlib.Display
import Graphics.X11.XScreenSaver import Graphics.X11.XScreenSaver
import Graphics.X11.Xlib.Display
import XMonad.Internal.DBus.Common import XMonad.Internal.DBus.Common
import XMonad.Internal.Process import XMonad.Internal.Process

View File

@ -11,8 +11,8 @@ module Xmobar.Plugins.Bluetooth (Bluetooth(..)) where
import DBus import DBus
import DBus.Client import DBus.Client
import Xmobar
import XMonad.Hooks.DynamicLog (xmobarColor) import XMonad.Hooks.DynamicLog (xmobarColor)
import Xmobar
data Bluetooth = Bluetooth (String, String, String) Int data Bluetooth = Bluetooth (String, String, String) Int
deriving (Read, Show) deriving (Read, Show)

View File

@ -17,8 +17,8 @@ import Data.Word
import DBus import DBus
import DBus.Client import DBus.Client
import Xmobar
import XMonad.Hooks.DynamicLog (xmobarColor) import XMonad.Hooks.DynamicLog (xmobarColor)
import Xmobar
data Device = Device (String, String, String, String) Int data Device = Device (String, String, String, String) Int
deriving (Read, Show) deriving (Read, Show)

View File

@ -11,8 +11,8 @@ module Xmobar.Plugins.VPN (VPN(..)) where
import DBus import DBus
import DBus.Client import DBus.Client
import Xmobar
import XMonad.Hooks.DynamicLog (xmobarColor) import XMonad.Hooks.DynamicLog (xmobarColor)
import Xmobar
data VPN = VPN (String, String, String) Int data VPN = VPN (String, String, String) Int
deriving (Read, Show) deriving (Read, Show)