Skip to content

Commit 24ed930

Browse files
author
Jamie Bertram
committed
Update import settings
1 parent 97a72a5 commit 24ed930

File tree

17 files changed

+225
-33
lines changed

17 files changed

+225
-33
lines changed
File renamed without changes.

.tidyrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
2-
"importWrap": "source",
2+
"importSort": "ide",
3+
"importWrap": "auto",
34
"indent": 2,
45
"operatorsFile": ".tidyoperators",
56
"ribbon": 1,

flake.nix

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,10 @@
121121

122122
fix-purs-tidy = pkgs.writeShellScriptBin "fix-purs-tidy" ''
123123
set -e
124-
echo updating operators file...
125-
${fd}/bin/fd \
126-
--no-ignore \
127-
--hidden \
128-
--extension purs \
129-
--exclude '*/.spago/*/*/test/*' \
130-
--exclude '.spago/*/*/test/*' \
131-
--exec-batch ${purs-tidy}/bin/purs-tidy generate-operators {} > .tidyoperators || true
132124
echo formatting PureScript files...
133125
${fd}/bin/fd \
134126
--extension purs \
135-
--exec-batch ${purs-tidy}/bin/purs-tidy format-in-place {} || true
127+
--exec-batch ${purs-tidy}/bin/purs-tidy format-in-place {}
136128
echo done.
137129
'';
138130

@@ -144,7 +136,7 @@
144136
--extension ts \
145137
--extension css \
146138
--extension html \
147-
--exec-batch ${prettier}/bin/prettier -w format-in-place {} || true
139+
--exec-batch ${prettier}/bin/prettier -w format-in-place {}
148140
echo done.
149141
'';
150142

src/Component/Expand.purs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,22 @@ module Component.Expand
99

1010
import Prologue
1111
import Component.Expand.State (handleAction, handleQuery, initialState)
12-
import Component.Expand.Types (Action(..), Component, ComponentHTML, Slot, State)
13-
import Component.Expand.Types (Action, Component, ComponentHTML, Input, Query(..), Slot, State(..)) as Types
12+
import Component.Expand.Types
13+
( Action(..)
14+
, Component
15+
, ComponentHTML
16+
, Slot
17+
, State
18+
)
19+
import Component.Expand.Types
20+
( Action
21+
, Component
22+
, ComponentHTML
23+
, Input
24+
, Query(..)
25+
, Slot
26+
, State(..)
27+
) as Types
1428
import Type.Proxy (Proxy(..))
1529
import Halogen as H
1630
import Halogen.HTML as HH

src/Component/Hint/State.purs

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,39 @@
11
module Component.Hint.State (component, hint) where
22

33
import Prologue
4-
import Component.Hint.Lenses (_active, _content, _mGlobalClickSubscription, _mPopperInstance, _placement)
5-
import Component.Hint.Types (Action(..), Input, State, arrowRef, hintRef, popoutRef)
4+
import Component.Hint.Lenses
5+
( _active
6+
, _content
7+
, _mGlobalClickSubscription
8+
, _mPopperInstance
9+
, _placement
10+
)
11+
import Component.Hint.Types
12+
( Action(..)
13+
, Input
14+
, State
15+
, arrowRef
16+
, hintRef
17+
, popoutRef
18+
)
619
import Component.Hint.View (render)
7-
import Component.Popper (OffsetOption(..), PaddingOption(..), Placement, PositioningStrategy(..), arrow, createPopper, defaultFlip, defaultModifiers, defaultPreventOverflow, destroyPopper, flipPlacement, forceUpdate, offset, pAll, preventOverflow)
20+
import Component.Popper
21+
( OffsetOption(..)
22+
, PaddingOption(..)
23+
, Placement
24+
, PositioningStrategy(..)
25+
, arrow
26+
, createPopper
27+
, defaultFlip
28+
, defaultModifiers
29+
, defaultPreventOverflow
30+
, destroyPopper
31+
, flipPlacement
32+
, forceUpdate
33+
, offset
34+
, pAll
35+
, preventOverflow
36+
)
837
import Control.Monad.Maybe.Trans (MaybeT(..), runMaybeT)
938
import Control.MonadPlus (guard)
1039
import Data.Filterable (filterMap)
@@ -14,7 +43,16 @@ import Data.Lens (assign, set, use)
1443
import Data.Traversable (for, traverse)
1544
import Effect (Effect)
1645
import Effect.Aff.Class (class MonadAff)
17-
import Halogen (Component, HalogenM, Slot, get, getHTMLElementRef, liftEffect, mkComponent, modify_)
46+
import Halogen
47+
( Component
48+
, HalogenM
49+
, Slot
50+
, get
51+
, getHTMLElementRef
52+
, liftEffect
53+
, mkComponent
54+
, modify_
55+
)
1856
import Halogen as H
1957
import Halogen.HTML (ComponentHTML, PlainHTML, slot)
2058
import Halogen.Query.Event.Extra (eventListenerEffect)

src/Component/Popper.purs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,19 @@ module Component.Popper
77
) where
88

99
import Component.Popper.Types
10-
import Component.Popper.Internal (createPopper, forceUpdate, destroyPopper, arrow, computeStyles, applyStyles, eventListeners, popperOffsets, offset, preventOverflow, flipPlacement) as ExportedInternal
10+
import Component.Popper.Internal
11+
( createPopper
12+
, forceUpdate
13+
, destroyPopper
14+
, arrow
15+
, computeStyles
16+
, applyStyles
17+
, eventListeners
18+
, popperOffsets
19+
, offset
20+
, preventOverflow
21+
, flipPlacement
22+
) as ExportedInternal
1123

1224
defaultModifiers :: Array Modifier
1325
defaultModifiers =

src/Component/Popper/Internal.purs

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,25 @@ module Component.Popper.Internal
1616

1717
import Prelude
1818

19-
import Component.Popper.Types (Boundary(..), ComputeStyleOptions, EventListenerOptions, Modifier, Offset, OffsetOption(..), Options, Padding(..), PaddingOption(..), Placement(..), PopperInstance, PositioningStrategy(..), PreventOverflowOptions, Rect, RootBoundary(..), TetherOffsetOption(..), FlipOptions)
19+
import Component.Popper.Types
20+
( Boundary(..)
21+
, ComputeStyleOptions
22+
, EventListenerOptions
23+
, Modifier
24+
, Offset
25+
, OffsetOption(..)
26+
, Options
27+
, Padding(..)
28+
, PaddingOption(..)
29+
, Placement(..)
30+
, PopperInstance
31+
, PositioningStrategy(..)
32+
, PreventOverflowOptions
33+
, Rect
34+
, RootBoundary(..)
35+
, TetherOffsetOption(..)
36+
, FlipOptions
37+
)
2038
import Data.Argonaut.Core (Json, fromNumber, fromString)
2139
import Data.Argonaut.Encode (encodeJson)
2240
import Data.Array as Array

src/Component/Tooltip/State.purs

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,54 @@
11
module Component.Tooltip.State (component, tooltip) where
22

33
import Prologue
4-
import Component.Popper (OffsetOption(..), PaddingOption(..), Placement, PositioningStrategy(..), arrow, createPopper, defaultFlip, defaultModifiers, defaultPreventOverflow, destroyPopper, flipPlacement, forceUpdate, offset, pAll, preventOverflow)
5-
import Component.Tooltip.Lenses (_active, _mPopperInstance, _message, _placement)
6-
import Component.Tooltip.Types (Action(..), Input, ReferenceId(..), State, arrowRef, tooltipRef)
4+
import Component.Popper
5+
( OffsetOption(..)
6+
, PaddingOption(..)
7+
, Placement
8+
, PositioningStrategy(..)
9+
, arrow
10+
, createPopper
11+
, defaultFlip
12+
, defaultModifiers
13+
, defaultPreventOverflow
14+
, destroyPopper
15+
, flipPlacement
16+
, forceUpdate
17+
, offset
18+
, pAll
19+
, preventOverflow
20+
)
21+
import Component.Tooltip.Lenses
22+
( _active
23+
, _mPopperInstance
24+
, _message
25+
, _placement
26+
)
27+
import Component.Tooltip.Types
28+
( Action(..)
29+
, Input
30+
, ReferenceId(..)
31+
, State
32+
, arrowRef
33+
, tooltipRef
34+
)
735
import Component.Tooltip.View (render)
836
import Control.Bind (bindFlipped)
937
import Control.Monad.Maybe.Trans (MaybeT(..), runMaybeT)
1038
import Data.Foldable (for_)
1139
import Data.Lens (assign, set, use)
1240
import Effect (Effect)
1341
import Effect.Aff.Class (class MonadAff)
14-
import Halogen (Component, HalogenM, Slot, get, getHTMLElementRef, liftEffect, mkComponent, modify_)
42+
import Halogen
43+
( Component
44+
, HalogenM
45+
, Slot
46+
, get
47+
, getHTMLElementRef
48+
, liftEffect
49+
, mkComponent
50+
, modify_
51+
)
1552
import Halogen as H
1653
import Halogen.HTML (ComponentHTML, slot)
1754
import Halogen.Query.Event (eventListener)

src/Control/Monad/Error/Extra.purs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ module Control.Monad.Error.Extra where
22

33
import Control.Monad (pure, (=<<))
44
import Control.Monad.Except (Except)
5-
import Control.Monad.Except.Trans (class MonadThrow, ExceptT, runExceptT, throwError)
5+
import Control.Monad.Except.Trans
6+
( class MonadThrow
7+
, ExceptT
8+
, runExceptT
9+
, throwError
10+
)
611
import Data.Either (Either(..), either)
712
import Data.Function (($), (<<<))
813
import Data.Newtype (unwrap)

src/Data/Argonaut/Extra.purs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ module Data.Argonaut.Extra where
33
import Prologue
44

55
import Data.Argonaut.Core (stringify)
6-
import Data.Argonaut.Decode (class DecodeJson, JsonDecodeError, decodeJson, parseJson)
6+
import Data.Argonaut.Decode
7+
( class DecodeJson
8+
, JsonDecodeError
9+
, decodeJson
10+
, parseJson
11+
)
712
import Data.Argonaut.Encode (class EncodeJson, encodeJson)
813

914
parseDecodeJson

src/Halogen/ElementResize.purs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ import Data.Array (head)
55
import Data.Traversable (traverse_)
66
import Halogen.Subscription as HS
77
import Web.DOM (Element)
8-
import Web.DOM.ResizeObserver (ResizeObserverBoxOptions, ResizeObserverEntry, observe, resizeObserver, unobserve)
8+
import Web.DOM.ResizeObserver
9+
( ResizeObserverBoxOptions
10+
, ResizeObserverEntry
11+
, observe
12+
, resizeObserver
13+
, unobserve
14+
)
915

1016
elementResize
1117
:: forall action

src/Halogen/Extra.purs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,16 @@ import Type.Proxy (Proxy(..))
1313
import Data.Tuple (Tuple(..))
1414
import Effect.Class (class MonadEffect, liftEffect)
1515
import Effect.Uncurried (EffectFn1, runEffectFn1)
16-
import Halogen (Component, ComponentHTML, HalogenF(..), HalogenM(..), RefLabel, Slot, getHTMLElementRef, mkComponent)
16+
import Halogen
17+
( Component
18+
, ComponentHTML
19+
, HalogenF(..)
20+
, HalogenM(..)
21+
, RefLabel
22+
, Slot
23+
, getHTMLElementRef
24+
, mkComponent
25+
)
1726
import Halogen as H
1827
import Halogen.HTML (IProp, div_, slot)
1928
import Halogen.HTML.Core (Prop)

src/Halogen/Monaco.purs

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@ import Data.Array (catMaybes)
1414
import Data.Enum (class BoundedEnum, class Enum)
1515
import Data.Generic.Rep (class Generic)
1616
import Data.Bounded.Generic (genericBottom, genericTop)
17-
import Data.Enum.Generic (genericCardinality, genericFromEnum, genericPred, genericSucc, genericToEnum)
17+
import Data.Enum.Generic
18+
( genericCardinality
19+
, genericFromEnum
20+
, genericPred
21+
, genericSucc
22+
, genericToEnum
23+
)
1824
import Data.Eq.Generic (genericEq)
1925
import Data.Ord.Generic (genericCompare)
2026
import Data.Lens (Lens', set, use, view)
@@ -31,7 +37,24 @@ import Halogen.ElementResize (elementResize)
3137
import Halogen.HTML (HTML, div)
3238
import Halogen.HTML.Properties (class_, ref)
3339
import Halogen.Subscription as HS
34-
import Monaco (CodeActionProvider, CompletionItemProvider, DocumentFormattingEditProvider, Editor, HoverProvider, IDisposable, IMarker, IMarkerData, IModelDeltaDecoration, IPosition, IRange, LanguageExtensionPoint, MonarchLanguage, Theme, TokensProvider, dispose)
40+
import Monaco
41+
( CodeActionProvider
42+
, CompletionItemProvider
43+
, DocumentFormattingEditProvider
44+
, Editor
45+
, HoverProvider
46+
, IDisposable
47+
, IMarker
48+
, IMarkerData
49+
, IModelDeltaDecoration
50+
, IPosition
51+
, IRange
52+
, LanguageExtensionPoint
53+
, MonarchLanguage
54+
, Theme
55+
, TokensProvider
56+
, dispose
57+
)
3558
import Monaco as Monaco
3659
import Web.DOM.ResizeObserver (ResizeObserverBoxOptions(..))
3760
import Web.HTML.HTMLElement as HTMLElement

src/Halogen/SVG.purs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,16 @@ import DOM.HTML.Indexed (Interactive)
55
import Data.Array as Array
66
import Data.Newtype (unwrap)
77
import Data.String (joinWith)
8-
import Halogen.HTML (AttrName(..), ClassName, ElemName(..), HTML, Namespace(..), Node, elementNS, text)
8+
import Halogen.HTML
9+
( AttrName(..)
10+
, ClassName
11+
, ElemName(..)
12+
, HTML
13+
, Namespace(..)
14+
, Node
15+
, elementNS
16+
, text
17+
)
918
import Halogen.HTML as HH
1019
import Halogen.HTML.Properties (CSSPixel, IProp)
1120

src/Language/Haskell/Monaco.purs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ import Effect.Class (class MonadEffect, liftEffect)
88
import Effect.Uncurried (EffectFn1, runEffectFn1)
99
import Halogen (RefLabel(..))
1010
import Halogen.Monaco (Settings)
11-
import Monaco (Editor, IStandaloneThemeData, LanguageExtensionPoint(..), MonarchLanguage, Theme)
11+
import Monaco
12+
( Editor
13+
, IStandaloneThemeData
14+
, LanguageExtensionPoint(..)
15+
, MonarchLanguage
16+
, Theme
17+
)
1218

1319
foreign import monarchTokensProvider_ :: EffectFn1 Unit MonarchLanguage
1420

src/Monaco.purs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,16 @@ import Data.Newtype (class Newtype)
1515
import Data.Nullable (Nullable, toMaybe)
1616
import Data.String.Regex (Regex)
1717
import Effect (Effect)
18-
import Effect.Uncurried (EffectFn1, EffectFn2, EffectFn3, EffectFn4, runEffectFn1, runEffectFn2, runEffectFn3, runEffectFn4)
18+
import Effect.Uncurried
19+
( EffectFn1
20+
, EffectFn2
21+
, EffectFn3
22+
, EffectFn4
23+
, runEffectFn1
24+
, runEffectFn2
25+
, runEffectFn3
26+
, runEffectFn4
27+
)
1928
import Foreign.Object (Object)
2029
import Foreign.Object as Object
2130
import Type.Proxy (Proxy(..))

src/Text/Pretty.purs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,15 @@ import Data.Array (intersperse)
2323
import Data.BigInt.Argonaut (BigInt)
2424
import Data.BigInt.Argonaut as BigInt
2525
import Data.Foldable (any, fold, intercalate)
26-
import Data.Generic.Rep (class Generic, Argument(..), Constructor(..), NoArguments, Product(..), Sum(..), from)
26+
import Data.Generic.Rep
27+
( class Generic
28+
, Argument(..)
29+
, Constructor(..)
30+
, NoArguments
31+
, Product(..)
32+
, Sum(..)
33+
, from
34+
)
2735
import Data.String.Extra (repeat)
2836
import Data.Symbol (class IsSymbol, reflectSymbol)
2937
import Type.Proxy (Proxy(..))

0 commit comments

Comments
 (0)