Restyle with Fourmolu

src/Swarm/DocGen.hs

@@ -33,7 +33,7 @@ import Data.Text (Text, unpack)
 import Data.Text qualified as T
 import Data.Text.IO qualified as T
 import Data.Tuple (swap)
-import Swarm.Game.Entity (Entity, EntityMap (entitiesByName), entityName, loadEntities, Count)
+import Swarm.Game.Entity (Count, Entity, EntityMap (entitiesByName), entityName, loadEntities)
 import Swarm.Game.Entity qualified as E
 import Swarm.Game.Recipe (Recipe, loadRecipes, recipeInputs, recipeOutputs, recipeRequirements)
 import Swarm.Game.Robot (installedDevices, instantiateRobot, robotInventory)

src/Swarm/Game/Entity.hs

@@ -52,7 +52,7 @@ module Swarm.Game.Entity (
   -- * Inventories
   Inventory,
   Count,
-  Number(..),
+  Number (..),
 
   -- ** Construction
   empty,
@@ -106,12 +106,12 @@ import GHC.Generics (Generic)
 import Linear (V2)
 import Swarm.Game.Display
 import Swarm.Language.Capability
+import Swarm.Language.Number (Number (..))
 import Swarm.Util (dataNotFound, getDataFileNameSafe, plural, reflow, (?))
 import Swarm.Util.Yaml
 import Text.Read (readMaybe)
 import Witch
 import Prelude hiding (lookup)
-import Swarm.Language.Number (Number (..))
 
 ------------------------------------------------------------
 -- Properties
@@ -599,7 +599,6 @@ deleteAll e (Inventory cs byN h) =
  where
   n = (fst <$> IM.lookup (e ^. entityHash) cs) ? 0
 
-
 -- | Get the entities in an inventory and their associated counts.
 elems :: Inventory -> [(Count, Entity)]
 elems (Inventory cs _ _) = IM.elems cs

src/Swarm/Game/Step.hs

@@ -50,8 +50,9 @@ import Data.Tuple (swap)
 import Linear (V2 (..), zero, (^+^))
 import Swarm.Game.CESK
 import Swarm.Game.Display
-import Swarm.Game.Entity hiding (empty, lookup, singleton, union, Integer)
-import Swarm.Game.Entity qualified as E 
+import Swarm.Game.Entity (Number (..))
+import Swarm.Game.Entity hiding (Integer, empty, lookup, singleton, union)
+import Swarm.Game.Entity qualified as E
 import Swarm.Game.Exception
 import Swarm.Game.Recipe
 import Swarm.Game.Robot
@@ -72,7 +73,6 @@ import System.Clock qualified
 import System.Random (UniformRange, uniformR)
 import Witch (From (from), into)
 import Prelude hiding (lookup)
-import Swarm.Game.Entity (Number(..))
 
 -- | The main function to do one game tick.  The only reason we need
 --   @IO@ is so that robots can run programs loaded from files, via
@@ -1377,7 +1377,6 @@ execConst c vs s k = do
             let salvageInventory = E.union (target ^. robotInventory) (target ^. installedDevices)
             robotMap . at (target ^. robotID) . traverse . robotInventory .= salvageInventory
 
-
             -- Copy over the salvaged robot's log, if we have one
             inst <- use installedDevices
             em <- use entityMap
@@ -1401,14 +1400,16 @@ execConst c vs s k = do
             robotMap . at (target ^. robotID) . traverse . systemRobot .= True
 
             ourID <- use @Robot robotID
-            let salvageItems = if system || creative
-                  then []
-                  else concatMap (uncurry replicateCount) (E.elems salvageInventory)
+            let salvageItems =
+                  if system || creative
+                    then []
+                    else concatMap (uncurry replicateCount) (E.elems salvageInventory)
                 numItems = length salvageItems
-                replicateCount n e = e ^. entityName & case n of
-                  E.Integer x -> replicate (fromIntegral x)
-                  E.PosInfinity -> replicate 42
-                  E.NegInfinity -> replicate (-42)
+                replicateCount n e =
+                  e ^. entityName & case n of
+                    E.Integer x -> replicate (fromIntegral x)
+                    E.PosInfinity -> replicate 42
+                    E.NegInfinity -> replicate (-42)
 
             -- The program for the salvaged robot to run
             let giveInventory =
@@ -1989,13 +1990,13 @@ safeDiv i 0 = return $ signum i * PosInfinity
 safeDiv (Integer a) (Integer b) = return . Integer $ a `div` b
 safeDiv (Integer _a) _ = return 0
 safeDiv i b@(Integer _b) = return $ b * i
-safeDiv _ _ = throwError $ CmdFailed Div "Dividing infinities" 
+safeDiv _ _ = throwError $ CmdFailed Div "Dividing infinities"
 
 -- | Perform exponentiation, but fail on negative powers and negative number to the poer of infinity.
 safeExp :: Has (Throw Exn) sig m => Number -> Number -> m Number
 safeExp = \case
   PosInfinity -> \b -> return $ PosInfinity * signum b
-  NegInfinity -> \b -> return $ NegInfinity * signum b 
+  NegInfinity -> \b -> return $ NegInfinity * signum b
   Integer a -> \case
     PosInfinity
       | a == 0 -> return 0

src/Swarm/Game/Value.hs

@@ -29,10 +29,10 @@ import Data.Set.Lens (setOf)
 import Data.Text (Text)
 import GHC.Generics (Generic)
 import Swarm.Language.Context
+import Swarm.Language.Number (Number)
 import Swarm.Language.Pretty (prettyText)
 import Swarm.Language.Syntax
 import Prelude
-import Swarm.Language.Number (Number)
 
 -- | A /value/ is a term that cannot (or does not) take any more
 --   evaluation steps on its own.

src/Swarm/Game/World.hs

@@ -75,11 +75,11 @@ instance Wrapped Coords
 
 -- | Convert an (x,y) location to a 'Coords' value.
 locToCoords :: V2 Int64 -> Coords
-locToCoords (V2 x y) = Coords (- y, x)
+locToCoords (V2 x y) = Coords (-y, x)
 
 -- | Convert 'Coords' to an (x,y) location.
 coordsToLoc :: Coords -> V2 Int64
-coordsToLoc (Coords (r, c)) = V2 c (- r)
+coordsToLoc (Coords (r, c)) = V2 c (-r)
 
 ------------------------------------------------------------
 -- World function

src/Swarm/Language/Number.hs

@@ -1,13 +1,15 @@
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE InstanceSigs #-}
+{-# LANGUAGE OverloadedStrings #-}
+
 module Swarm.Language.Number (
-    Number(..),
+  Number (..),
 ) where
-import GHC.Generics (Generic)
+
 import Data.Data (Data)
 import Data.Yaml (ToJSON (..))
+import Data.Yaml.Aeson (FromJSON (..), Value (..))
+import GHC.Generics (Generic)
 import Swarm.Util.Yaml (FromJSONE)
-import Data.Yaml.Aeson ( FromJSON(..), Value(..) )
 
 -- | A type that represent the quantity of something.
 --
@@ -33,8 +35,9 @@ instance FromJSON Number where
         else fail "Integer is not a whole number!"
     String "-inf" -> pure NegInfinity
     String "inf" -> pure PosInfinity
-    e -> fail $
-      "Expected number or null for count, but got '" <> show e <> "'!"
+    e ->
+      fail $
+        "Expected number or null for count, but got '" <> show e <> "'!"
 
 instance FromJSONE e Number
 
@@ -63,4 +66,4 @@ instance Num Number where
   negate :: Number -> Number
   negate (Integer c) = Integer (negate c)
   negate NegInfinity = PosInfinity
-  negate PosInfinity = NegInfinity  
+  negate PosInfinity = NegInfinity

src/Swarm/Language/Parse.hs

@@ -48,14 +48,14 @@ import Data.Set.Lens (setOf)
 import Data.Text (Text, index, toLower)
 import Data.Text qualified as T
 import Data.Void
+import Swarm.Language.Number (Number (Integer))
 import Swarm.Language.Syntax
 import Swarm.Language.Types
 import Text.Megaparsec hiding (runParser)
 import Text.Megaparsec.Char
 import Text.Megaparsec.Char.Lexer qualified as L
 import Text.Megaparsec.Pos qualified as Pos
 import Witch
-import Swarm.Language.Number (Number(Integer))
 
 -- Imports for doctests (cabal-docspec needs this)
 

src/Swarm/Language/Pretty.hs

@@ -26,12 +26,11 @@ import Prettyprinter.Render.String qualified as RS
 import Prettyprinter.Render.Text qualified as RT
 import Swarm.Language.Capability
 import Swarm.Language.Context
+import Swarm.Language.Number (Number (..))
 import Swarm.Language.Syntax
 import Swarm.Language.Typecheck
 import Swarm.Language.Types
 import Witch
-import Swarm.Language.Number ( Number(..) )
-
 
 -- | Type class for things that can be pretty-printed, given a
 --   precedence level of their context.

src/Swarm/Language/Requirement.hs

@@ -40,8 +40,8 @@ import GHC.Generics (Generic)
 import Swarm.Language.Capability (Capability (..), constCaps)
 import Swarm.Language.Context (Ctx)
 import Swarm.Language.Context qualified as Ctx
+import Swarm.Language.Number (Number (..))
 import Swarm.Language.Syntax hiding (Count)
-import Swarm.Language.Number (Number(..))
 
 -- | A /requirement/ is something a robot must have when it is
 --   built. There are three types:

src/Swarm/Language/Syntax.hs

@@ -85,9 +85,9 @@ import Data.Text hiding (filter, map)
 import Data.Text qualified as T
 import GHC.Generics (Generic)
 import Linear
+import Swarm.Language.Number (Number)
 import Swarm.Language.Types
 import Witch.From (from)
-import Swarm.Language.Number (Number)
 
 ------------------------------------------------------------
 -- Constants

test/unit/TestEval.hs

@@ -9,12 +9,12 @@ import Data.Text (Text)
 import Data.Text qualified as T
 import Swarm.Game.State
 import Swarm.Game.Value
+import Swarm.Language.Number (Number (Integer, PosInfinity))
 import Test.Tasty
 import Test.Tasty.HUnit
 import Test.Tasty.QuickCheck
 import TestUtil
 import Witch (from)
-import Swarm.Language.Number (Number(Integer, PosInfinity))
 
 testEval :: GameState -> TestTree
 testEval g =