From 7e1c67b58e4dbaf879bf17e3a0f4b835313dfa15 Mon Sep 17 00:00:00 2001 From: "restyled-io[bot]" <32688539+restyled-io[bot]@users.noreply.github.com> Date: Sat, 28 Sep 2024 11:01:57 -0500 Subject: [PATCH] Restyled by fourmolu (#2156) Co-authored-by: Restyled.io --- app/game/Swarm/App.hs | 2 +- src/swarm-doc/Swarm/Doc/Wiki/Cheatsheet.hs | 2 +- src/swarm-engine/Swarm/Game/Exception.hs | 2 +- src/swarm-tui/Swarm/TUI/Controller/UpdateUI.hs | 2 +- src/swarm-tui/Swarm/TUI/Model/StateUpdate.hs | 2 +- src/swarm-tui/Swarm/TUI/View.hs | 2 +- src/swarm-tui/Swarm/TUI/View/Robot/Details.hs | 2 +- src/swarm-tui/Swarm/TUI/View/Util.hs | 2 +- test/integration/Main.hs | 2 +- test/unit/TestLanguagePipeline.hs | 2 +- test/unit/TestPretty.hs | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/game/Swarm/App.hs b/app/game/Swarm/App.hs index 85baf0d64..1af7d6ce8 100644 --- a/app/game/Swarm/App.hs +++ b/app/game/Swarm/App.hs @@ -34,8 +34,8 @@ import Graphics.Vty qualified as V import Graphics.Vty.CrossPlatform qualified as V import Swarm.Game.Failure (SystemFailure) import Swarm.Game.State.Runtime -import Swarm.Pretty (prettyText) import Swarm.Log (LogSource (SystemLog), Severity (..)) +import Swarm.Pretty (prettyText) import Swarm.TUI.Controller import Swarm.TUI.Model import Swarm.TUI.Model.StateUpdate diff --git a/src/swarm-doc/Swarm/Doc/Wiki/Cheatsheet.hs b/src/swarm-doc/Swarm/Doc/Wiki/Cheatsheet.hs index f9c8fdb90..b0ade55f3 100644 --- a/src/swarm-doc/Swarm/Doc/Wiki/Cheatsheet.hs +++ b/src/swarm-doc/Swarm/Doc/Wiki/Cheatsheet.hs @@ -37,11 +37,11 @@ import Swarm.Game.Recipe (Recipe, loadRecipes, recipeCatalysts, recipeInputs, re import Swarm.Game.Terrain (loadTerrain, terrainByName) import Swarm.Language.Capability (Capability) import Swarm.Language.Capability qualified as Capability -import Swarm.Pretty (prettyText, prettyTextLine) import Swarm.Language.Syntax (Const (..)) import Swarm.Language.Syntax qualified as Syntax import Swarm.Language.Text.Markdown as Markdown (docToMark) import Swarm.Language.Typecheck (inferConst) +import Swarm.Pretty (prettyText, prettyTextLine) import Swarm.Util (maximum0, showT) -- * Types diff --git a/src/swarm-engine/Swarm/Game/Exception.hs b/src/swarm-engine/Swarm/Game/Exception.hs index dd6cb8ebb..e9cccc3ec 100644 --- a/src/swarm-engine/Swarm/Game/Exception.hs +++ b/src/swarm-engine/Swarm/Game/Exception.hs @@ -30,10 +30,10 @@ import Swarm.Game.Achievement.Definitions import Swarm.Game.Entity (EntityMap, devicesForCap, entityName) import Swarm.Language.Capability (Capability (CGod), capabilityName) import Swarm.Language.JSON () -import Swarm.Pretty (prettyText) import Swarm.Language.Requirements.Type (Requirements (..)) import Swarm.Language.Syntax (Const, Term) import Swarm.Log (Severity (..)) +import Swarm.Pretty (prettyText) import Swarm.Util import Witch (from) diff --git a/src/swarm-tui/Swarm/TUI/Controller/UpdateUI.hs b/src/swarm-tui/Swarm/TUI/Controller/UpdateUI.hs index 20b25d1a4..236464c97 100644 --- a/src/swarm-tui/Swarm/TUI/Controller/UpdateUI.hs +++ b/src/swarm-tui/Swarm/TUI/Controller/UpdateUI.hs @@ -33,10 +33,10 @@ import Swarm.Game.Robot.Concrete import Swarm.Game.State import Swarm.Game.State.Landscape import Swarm.Game.State.Substate -import Swarm.Pretty import Swarm.Language.Typed (Typed (..)) import Swarm.Language.Types import Swarm.Language.Value (Value (VExc, VUnit), envTydefs, prettyValue) +import Swarm.Pretty import Swarm.TUI.Controller.SaveScenario (saveScenarioInfoOnFinishNocheat) import Swarm.TUI.Controller.Util import Swarm.TUI.Model diff --git a/src/swarm-tui/Swarm/TUI/Model/StateUpdate.hs b/src/swarm-tui/Swarm/TUI/Model/StateUpdate.hs index 237b93688..6870145b0 100644 --- a/src/swarm-tui/Swarm/TUI/Model/StateUpdate.hs +++ b/src/swarm-tui/Swarm/TUI/Model/StateUpdate.hs @@ -73,8 +73,8 @@ import Swarm.Game.State.Landscape import Swarm.Game.State.Runtime import Swarm.Game.State.Substate import Swarm.Game.World.Gen (Seed) -import Swarm.Pretty (prettyText) import Swarm.Log (LogSource (SystemLog), Severity (..)) +import Swarm.Pretty (prettyText) import Swarm.TUI.Editor.Model qualified as EM import Swarm.TUI.Editor.Util qualified as EU import Swarm.TUI.Inventory.Sorting diff --git a/src/swarm-tui/Swarm/TUI/View.hs b/src/swarm-tui/Swarm/TUI/View.hs index a67302f8a..bb6372dc3 100644 --- a/src/swarm-tui/Swarm/TUI/View.hs +++ b/src/swarm-tui/Swarm/TUI/View.hs @@ -111,10 +111,10 @@ import Swarm.Game.Universe import Swarm.Game.World.Coords import Swarm.Game.World.Gen (Seed) import Swarm.Language.Capability (Capability (..), constCaps) -import Swarm.Pretty (prettyText, prettyTextLine, prettyTextWidth) import Swarm.Language.Syntax import Swarm.Language.Typecheck (inferConst) import Swarm.Log +import Swarm.Pretty (prettyText, prettyTextLine, prettyTextWidth) import Swarm.TUI.Border import Swarm.TUI.Controller (ticksPerFrameCap) import Swarm.TUI.Controller.EventHandlers (allEventHandlers, mainEventHandlers, replEventHandlers, robotEventHandlers, worldEventHandlers) diff --git a/src/swarm-tui/Swarm/TUI/View/Robot/Details.hs b/src/swarm-tui/Swarm/TUI/View/Robot/Details.hs index 77c03028a..7ac6eb3be 100644 --- a/src/swarm-tui/Swarm/TUI/View/Robot/Details.hs +++ b/src/swarm-tui/Swarm/TUI/View/Robot/Details.hs @@ -17,8 +17,8 @@ import Prettyprinter (pretty) import Swarm.Game.Robot import Swarm.Game.Robot.Activity (commandsHistogram) import Swarm.Game.Robot.Concrete -import Swarm.Language.Pretty (prettyText) import Swarm.Log +import Swarm.Pretty (prettyText) import Swarm.TUI.Model.Name import Swarm.TUI.View.Attribute.Attr (boldAttr, cyanAttr) import Swarm.TUI.View.Robot.Type diff --git a/src/swarm-tui/Swarm/TUI/View/Util.hs b/src/swarm-tui/Swarm/TUI/View/Util.hs index 166cd95c7..bb1aa384c 100644 --- a/src/swarm-tui/Swarm/TUI/View/Util.hs +++ b/src/swarm-tui/Swarm/TUI/View/Util.hs @@ -24,10 +24,10 @@ import Swarm.Game.State import Swarm.Game.State.Landscape import Swarm.Game.State.Substate import Swarm.Game.Terrain -import Swarm.Pretty (prettyTextLine) import Swarm.Language.Syntax (Syntax) import Swarm.Language.Text.Markdown qualified as Markdown import Swarm.Language.Types (Polytype) +import Swarm.Pretty (prettyTextLine) import Swarm.TUI.Model import Swarm.TUI.Model.Event (SwarmEvent) import Swarm.TUI.Model.UI diff --git a/test/integration/Main.hs b/test/integration/Main.hs index d502665bb..74be6dfea 100644 --- a/test/integration/Main.hs +++ b/test/integration/Main.hs @@ -67,8 +67,8 @@ import Swarm.Game.Step.Path.Type import Swarm.Game.Step.Validate (badErrorsInLogs, playUntilWin) import Swarm.Game.Tick (getTickNumber) import Swarm.Language.Pipeline (processTerm) -import Swarm.Pretty (prettyString) import Swarm.Log +import Swarm.Pretty (prettyString) import Swarm.TUI.Model ( KeyEventHandlingState, debugOptions, diff --git a/test/unit/TestLanguagePipeline.hs b/test/unit/TestLanguagePipeline.hs index 93aa0ee54..1eada6c9f 100644 --- a/test/unit/TestLanguagePipeline.hs +++ b/test/unit/TestLanguagePipeline.hs @@ -20,10 +20,10 @@ import Swarm.Language.Parser (readTerm) import Swarm.Language.Parser.QQ (tyQ) import Swarm.Language.Pipeline (processTerm) import Swarm.Language.Pipeline.QQ (tmQ) -import Swarm.Pretty (prettyText) import Swarm.Language.Syntax import Swarm.Language.Typecheck (isSimpleUType) import Swarm.Language.Types +import Swarm.Pretty (prettyText) import Test.Tasty import Test.Tasty.HUnit import Witch (from) diff --git a/test/unit/TestPretty.hs b/test/unit/TestPretty.hs index 265a841f3..0e61053de 100644 --- a/test/unit/TestPretty.hs +++ b/test/unit/TestPretty.hs @@ -7,9 +7,9 @@ module TestPretty where import Data.Fix (Fix (..)) -import Swarm.Pretty import Swarm.Language.Syntax hiding (mkOp) import Swarm.Language.Types +import Swarm.Pretty import Test.Tasty import Test.Tasty.HUnit import Witch (into)