diff --git a/.tinyoperators b/.tidyoperators similarity index 100% rename from .tinyoperators rename to .tidyoperators diff --git a/.tidyrc.json b/.tidyrc.json index e37080a..678acf3 100644 --- a/.tidyrc.json +++ b/.tidyrc.json @@ -1,5 +1,6 @@ { - "importWrap": "source", + "importSort": "ide", + "importWrap": "auto", "indent": 2, "operatorsFile": ".tidyoperators", "ribbon": 1, diff --git a/flake.nix b/flake.nix index b230389..676e77f 100644 --- a/flake.nix +++ b/flake.nix @@ -121,18 +121,10 @@ fix-purs-tidy = pkgs.writeShellScriptBin "fix-purs-tidy" '' set -e - echo updating operators file... - ${fd}/bin/fd \ - --no-ignore \ - --hidden \ - --extension purs \ - --exclude '*/.spago/*/*/test/*' \ - --exclude '.spago/*/*/test/*' \ - --exec-batch ${purs-tidy}/bin/purs-tidy generate-operators {} > .tidyoperators || true echo formatting PureScript files... ${fd}/bin/fd \ --extension purs \ - --exec-batch ${purs-tidy}/bin/purs-tidy format-in-place {} || true + --exec-batch ${purs-tidy}/bin/purs-tidy format-in-place {} echo done. ''; @@ -144,7 +136,7 @@ --extension ts \ --extension css \ --extension html \ - --exec-batch ${prettier}/bin/prettier -w format-in-place {} || true + --exec-batch ${prettier}/bin/prettier -w format-in-place {} echo done. ''; diff --git a/src/Component/Expand.purs b/src/Component/Expand.purs index 7d06ccb..46db4d7 100644 --- a/src/Component/Expand.purs +++ b/src/Component/Expand.purs @@ -9,8 +9,22 @@ module Component.Expand import Prologue import Component.Expand.State (handleAction, handleQuery, initialState) -import Component.Expand.Types (Action(..), Component, ComponentHTML, Slot, State) -import Component.Expand.Types (Action, Component, ComponentHTML, Input, Query(..), Slot, State(..)) as Types +import Component.Expand.Types + ( Action(..) + , Component + , ComponentHTML + , Slot + , State + ) +import Component.Expand.Types + ( Action + , Component + , ComponentHTML + , Input + , Query(..) + , Slot + , State(..) + ) as Types import Type.Proxy (Proxy(..)) import Halogen as H import Halogen.HTML as HH diff --git a/src/Component/Hint/State.purs b/src/Component/Hint/State.purs index 1694f8b..3b0cf36 100644 --- a/src/Component/Hint/State.purs +++ b/src/Component/Hint/State.purs @@ -1,10 +1,39 @@ module Component.Hint.State (component, hint) where import Prologue -import Component.Hint.Lenses (_active, _content, _mGlobalClickSubscription, _mPopperInstance, _placement) -import Component.Hint.Types (Action(..), Input, State, arrowRef, hintRef, popoutRef) +import Component.Hint.Lenses + ( _active + , _content + , _mGlobalClickSubscription + , _mPopperInstance + , _placement + ) +import Component.Hint.Types + ( Action(..) + , Input + , State + , arrowRef + , hintRef + , popoutRef + ) import Component.Hint.View (render) -import Component.Popper (OffsetOption(..), PaddingOption(..), Placement, PositioningStrategy(..), arrow, createPopper, defaultFlip, defaultModifiers, defaultPreventOverflow, destroyPopper, flipPlacement, forceUpdate, offset, pAll, preventOverflow) +import Component.Popper + ( OffsetOption(..) + , PaddingOption(..) + , Placement + , PositioningStrategy(..) + , arrow + , createPopper + , defaultFlip + , defaultModifiers + , defaultPreventOverflow + , destroyPopper + , flipPlacement + , forceUpdate + , offset + , pAll + , preventOverflow + ) import Control.Monad.Maybe.Trans (MaybeT(..), runMaybeT) import Control.MonadPlus (guard) import Data.Filterable (filterMap) @@ -14,7 +43,16 @@ import Data.Lens (assign, set, use) import Data.Traversable (for, traverse) import Effect (Effect) import Effect.Aff.Class (class MonadAff) -import Halogen (Component, HalogenM, Slot, get, getHTMLElementRef, liftEffect, mkComponent, modify_) +import Halogen + ( Component + , HalogenM + , Slot + , get + , getHTMLElementRef + , liftEffect + , mkComponent + , modify_ + ) import Halogen as H import Halogen.HTML (ComponentHTML, PlainHTML, slot) import Halogen.Query.Event.Extra (eventListenerEffect) diff --git a/src/Component/Popper.purs b/src/Component/Popper.purs index 9bae29a..aca68ec 100644 --- a/src/Component/Popper.purs +++ b/src/Component/Popper.purs @@ -7,7 +7,19 @@ module Component.Popper ) where import Component.Popper.Types -import Component.Popper.Internal (createPopper, forceUpdate, destroyPopper, arrow, computeStyles, applyStyles, eventListeners, popperOffsets, offset, preventOverflow, flipPlacement) as ExportedInternal +import Component.Popper.Internal + ( createPopper + , forceUpdate + , destroyPopper + , arrow + , computeStyles + , applyStyles + , eventListeners + , popperOffsets + , offset + , preventOverflow + , flipPlacement + ) as ExportedInternal defaultModifiers :: Array Modifier defaultModifiers = diff --git a/src/Component/Popper/Internal.purs b/src/Component/Popper/Internal.purs index 61059d5..19d3d3d 100644 --- a/src/Component/Popper/Internal.purs +++ b/src/Component/Popper/Internal.purs @@ -16,7 +16,25 @@ module Component.Popper.Internal import Prelude -import Component.Popper.Types (Boundary(..), ComputeStyleOptions, EventListenerOptions, Modifier, Offset, OffsetOption(..), Options, Padding(..), PaddingOption(..), Placement(..), PopperInstance, PositioningStrategy(..), PreventOverflowOptions, Rect, RootBoundary(..), TetherOffsetOption(..), FlipOptions) +import Component.Popper.Types + ( Boundary(..) + , ComputeStyleOptions + , EventListenerOptions + , Modifier + , Offset + , OffsetOption(..) + , Options + , Padding(..) + , PaddingOption(..) + , Placement(..) + , PopperInstance + , PositioningStrategy(..) + , PreventOverflowOptions + , Rect + , RootBoundary(..) + , TetherOffsetOption(..) + , FlipOptions + ) import Data.Argonaut.Core (Json, fromNumber, fromString) import Data.Argonaut.Encode (encodeJson) import Data.Array as Array diff --git a/src/Component/Tooltip/State.purs b/src/Component/Tooltip/State.purs index b8db895..f7aae85 100644 --- a/src/Component/Tooltip/State.purs +++ b/src/Component/Tooltip/State.purs @@ -1,9 +1,37 @@ module Component.Tooltip.State (component, tooltip) where import Prologue -import Component.Popper (OffsetOption(..), PaddingOption(..), Placement, PositioningStrategy(..), arrow, createPopper, defaultFlip, defaultModifiers, defaultPreventOverflow, destroyPopper, flipPlacement, forceUpdate, offset, pAll, preventOverflow) -import Component.Tooltip.Lenses (_active, _mPopperInstance, _message, _placement) -import Component.Tooltip.Types (Action(..), Input, ReferenceId(..), State, arrowRef, tooltipRef) +import Component.Popper + ( OffsetOption(..) + , PaddingOption(..) + , Placement + , PositioningStrategy(..) + , arrow + , createPopper + , defaultFlip + , defaultModifiers + , defaultPreventOverflow + , destroyPopper + , flipPlacement + , forceUpdate + , offset + , pAll + , preventOverflow + ) +import Component.Tooltip.Lenses + ( _active + , _mPopperInstance + , _message + , _placement + ) +import Component.Tooltip.Types + ( Action(..) + , Input + , ReferenceId(..) + , State + , arrowRef + , tooltipRef + ) import Component.Tooltip.View (render) import Control.Bind (bindFlipped) import Control.Monad.Maybe.Trans (MaybeT(..), runMaybeT) @@ -11,7 +39,16 @@ import Data.Foldable (for_) import Data.Lens (assign, set, use) import Effect (Effect) import Effect.Aff.Class (class MonadAff) -import Halogen (Component, HalogenM, Slot, get, getHTMLElementRef, liftEffect, mkComponent, modify_) +import Halogen + ( Component + , HalogenM + , Slot + , get + , getHTMLElementRef + , liftEffect + , mkComponent + , modify_ + ) import Halogen as H import Halogen.HTML (ComponentHTML, slot) import Halogen.Query.Event (eventListener) diff --git a/src/Control/Monad/Error/Extra.purs b/src/Control/Monad/Error/Extra.purs index 6d8da43..dd6ab71 100644 --- a/src/Control/Monad/Error/Extra.purs +++ b/src/Control/Monad/Error/Extra.purs @@ -2,7 +2,12 @@ module Control.Monad.Error.Extra where import Control.Monad (pure, (=<<)) import Control.Monad.Except (Except) -import Control.Monad.Except.Trans (class MonadThrow, ExceptT, runExceptT, throwError) +import Control.Monad.Except.Trans + ( class MonadThrow + , ExceptT + , runExceptT + , throwError + ) import Data.Either (Either(..), either) import Data.Function (($), (<<<)) import Data.Newtype (unwrap) diff --git a/src/Data/Argonaut/Extra.purs b/src/Data/Argonaut/Extra.purs index 5c79de2..373b6f4 100644 --- a/src/Data/Argonaut/Extra.purs +++ b/src/Data/Argonaut/Extra.purs @@ -3,7 +3,12 @@ module Data.Argonaut.Extra where import Prologue import Data.Argonaut.Core (stringify) -import Data.Argonaut.Decode (class DecodeJson, JsonDecodeError, decodeJson, parseJson) +import Data.Argonaut.Decode + ( class DecodeJson + , JsonDecodeError + , decodeJson + , parseJson + ) import Data.Argonaut.Encode (class EncodeJson, encodeJson) parseDecodeJson diff --git a/src/Halogen/ElementResize.purs b/src/Halogen/ElementResize.purs index b96c1bc..296b03c 100644 --- a/src/Halogen/ElementResize.purs +++ b/src/Halogen/ElementResize.purs @@ -5,7 +5,13 @@ import Data.Array (head) import Data.Traversable (traverse_) import Halogen.Subscription as HS import Web.DOM (Element) -import Web.DOM.ResizeObserver (ResizeObserverBoxOptions, ResizeObserverEntry, observe, resizeObserver, unobserve) +import Web.DOM.ResizeObserver + ( ResizeObserverBoxOptions + , ResizeObserverEntry + , observe + , resizeObserver + , unobserve + ) elementResize :: forall action diff --git a/src/Halogen/Extra.purs b/src/Halogen/Extra.purs index fd1a84e..4cf2580 100644 --- a/src/Halogen/Extra.purs +++ b/src/Halogen/Extra.purs @@ -13,7 +13,16 @@ import Type.Proxy (Proxy(..)) import Data.Tuple (Tuple(..)) import Effect.Class (class MonadEffect, liftEffect) import Effect.Uncurried (EffectFn1, runEffectFn1) -import Halogen (Component, ComponentHTML, HalogenF(..), HalogenM(..), RefLabel, Slot, getHTMLElementRef, mkComponent) +import Halogen + ( Component + , ComponentHTML + , HalogenF(..) + , HalogenM(..) + , RefLabel + , Slot + , getHTMLElementRef + , mkComponent + ) import Halogen as H import Halogen.HTML (IProp, div_, slot) import Halogen.HTML.Core (Prop) diff --git a/src/Halogen/Monaco.purs b/src/Halogen/Monaco.purs index 3ff11cd..56c99eb 100644 --- a/src/Halogen/Monaco.purs +++ b/src/Halogen/Monaco.purs @@ -14,7 +14,13 @@ import Data.Array (catMaybes) import Data.Enum (class BoundedEnum, class Enum) import Data.Generic.Rep (class Generic) import Data.Bounded.Generic (genericBottom, genericTop) -import Data.Enum.Generic (genericCardinality, genericFromEnum, genericPred, genericSucc, genericToEnum) +import Data.Enum.Generic + ( genericCardinality + , genericFromEnum + , genericPred + , genericSucc + , genericToEnum + ) import Data.Eq.Generic (genericEq) import Data.Ord.Generic (genericCompare) import Data.Lens (Lens', set, use, view) @@ -31,7 +37,24 @@ import Halogen.ElementResize (elementResize) import Halogen.HTML (HTML, div) import Halogen.HTML.Properties (class_, ref) import Halogen.Subscription as HS -import Monaco (CodeActionProvider, CompletionItemProvider, DocumentFormattingEditProvider, Editor, HoverProvider, IDisposable, IMarker, IMarkerData, IModelDeltaDecoration, IPosition, IRange, LanguageExtensionPoint, MonarchLanguage, Theme, TokensProvider, dispose) +import Monaco + ( CodeActionProvider + , CompletionItemProvider + , DocumentFormattingEditProvider + , Editor + , HoverProvider + , IDisposable + , IMarker + , IMarkerData + , IModelDeltaDecoration + , IPosition + , IRange + , LanguageExtensionPoint + , MonarchLanguage + , Theme + , TokensProvider + , dispose + ) import Monaco as Monaco import Web.DOM.ResizeObserver (ResizeObserverBoxOptions(..)) import Web.HTML.HTMLElement as HTMLElement diff --git a/src/Halogen/SVG.purs b/src/Halogen/SVG.purs index 910e0d5..72e1c88 100644 --- a/src/Halogen/SVG.purs +++ b/src/Halogen/SVG.purs @@ -5,7 +5,16 @@ import DOM.HTML.Indexed (Interactive) import Data.Array as Array import Data.Newtype (unwrap) import Data.String (joinWith) -import Halogen.HTML (AttrName(..), ClassName, ElemName(..), HTML, Namespace(..), Node, elementNS, text) +import Halogen.HTML + ( AttrName(..) + , ClassName + , ElemName(..) + , HTML + , Namespace(..) + , Node + , elementNS + , text + ) import Halogen.HTML as HH import Halogen.HTML.Properties (CSSPixel, IProp) diff --git a/src/Language/Haskell/Monaco.purs b/src/Language/Haskell/Monaco.purs index 1347fcb..260ba7b 100644 --- a/src/Language/Haskell/Monaco.purs +++ b/src/Language/Haskell/Monaco.purs @@ -8,7 +8,13 @@ import Effect.Class (class MonadEffect, liftEffect) import Effect.Uncurried (EffectFn1, runEffectFn1) import Halogen (RefLabel(..)) import Halogen.Monaco (Settings) -import Monaco (Editor, IStandaloneThemeData, LanguageExtensionPoint(..), MonarchLanguage, Theme) +import Monaco + ( Editor + , IStandaloneThemeData + , LanguageExtensionPoint(..) + , MonarchLanguage + , Theme + ) foreign import monarchTokensProvider_ :: EffectFn1 Unit MonarchLanguage diff --git a/src/Monaco.purs b/src/Monaco.purs index 4cd2a54..1a1520c 100644 --- a/src/Monaco.purs +++ b/src/Monaco.purs @@ -15,7 +15,16 @@ import Data.Newtype (class Newtype) import Data.Nullable (Nullable, toMaybe) import Data.String.Regex (Regex) import Effect (Effect) -import Effect.Uncurried (EffectFn1, EffectFn2, EffectFn3, EffectFn4, runEffectFn1, runEffectFn2, runEffectFn3, runEffectFn4) +import Effect.Uncurried + ( EffectFn1 + , EffectFn2 + , EffectFn3 + , EffectFn4 + , runEffectFn1 + , runEffectFn2 + , runEffectFn3 + , runEffectFn4 + ) import Foreign.Object (Object) import Foreign.Object as Object import Type.Proxy (Proxy(..)) diff --git a/src/Text/Pretty.purs b/src/Text/Pretty.purs index 4989b73..6cf559f 100644 --- a/src/Text/Pretty.purs +++ b/src/Text/Pretty.purs @@ -23,7 +23,15 @@ import Data.Array (intersperse) import Data.BigInt.Argonaut (BigInt) import Data.BigInt.Argonaut as BigInt import Data.Foldable (any, fold, intercalate) -import Data.Generic.Rep (class Generic, Argument(..), Constructor(..), NoArguments, Product(..), Sum(..), from) +import Data.Generic.Rep + ( class Generic + , Argument(..) + , Constructor(..) + , NoArguments + , Product(..) + , Sum(..) + , from + ) import Data.String.Extra (repeat) import Data.Symbol (class IsSymbol, reflectSymbol) import Type.Proxy (Proxy(..))