A peer-to-peer stack for code collaboration
Consistent stylish haskell formatting with oscoin repo
Tomás Senart44b21d786ed1
diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yamlindex d2eff5b..61ea090 100644--- a/.stylish-haskell.yaml+++ b/.stylish-haskell.yaml@@ -86,7 +86,7 @@ steps:# > )## Default: inline- long_list_align: inline+ long_list_align: new_line_multiline# Align empty list (importing instances)#@@ -164,7 +164,7 @@ steps:# between actual import and closing bracket.## Default: true- align: false+ align: true# stylish-haskell can detect redundancy of some language pragmas. If this# is set to true, it will remove those redundant pragmas. Default: true.@@ -177,14 +177,26 @@ columns: 80newline: nativelanguage_extensions:+ - AutoDeriveTypeable+ - ConstraintKinds+ - DataKinds+ - DeriveDataTypeable+ - DeriveFoldable+ - DeriveFunctor+ - DeriveGeneric+ - DeriveTraversable- FlexibleContexts+ - FlexibleInstances- FunctionalDependencies+ - GeneralizedNewtypeDeriving- LambdaCase- MultiParamTypeClasses- - MultiWayIf+ - NoImplicitPrelude+ - OverloadedStrings+ - RankNTypes- RecordWildCards- ScopedTypeVariables+ - StandaloneDeriving- TupleSections- - TypeApplications- TypeFamilies- - ViewPatterns+ - TypeOperatorsdiff --git a/exe/Repl/Main.hs b/exe/Repl/Main.hsindex 18d623c..1ee8904 100644--- a/exe/Repl/Main.hs+++ b/exe/Repl/Main.hs@@ -1,7 +1,7 @@module Main (main) where-import Protoludeimport Options.Applicative+import Protoludeimport Radiclediff --git a/exe/Server/API.hs b/exe/Server/API.hsindex 824ca84..fde0b54 100644--- a/exe/Server/API.hs+++ b/exe/Server/API.hs@@ -1,12 +1,12 @@{-# OPTIONS_GHC -fno-warn-orphans #-}module API where+import qualified Data.Aeson as A+import qualified Data.ByteString.Lazy as LBS+import qualified Data.Text as Timport Protoludeimport Radicleimport Servant.API-import qualified Data.ByteString.Lazy as LBS-import qualified Data.Text as T-import qualified Data.Aeson as Ainstance Show a => MimeRender PlainText a wheremimeRender _ x = show xdiff --git a/exe/Server/GHCJS.hs b/exe/Server/GHCJS.hsindex 31a6953..0f56345 100644--- a/exe/Server/GHCJS.hs+++ b/exe/Server/GHCJS.hs@@ -26,7 +26,7 @@ main = do$ runLang bindings$ interpretMany "[repl]" "(load! \"rad/prelude.rad\")"case res of- (Left err, _) -> liftIO $ print $ renderPrettyDef err+ (Left err, _) -> liftIO $ print $ renderPrettyDef err(Right _, newBnds) -> liftIO $ writeIORef bndsRef newBndscb <- syncCallback1 ContinueAsync (jsEval bndsRef)js_set_eval cbdiff --git a/exe/Server/Server.hs b/exe/Server/Server.hsindex 69e33db..53601b2 100644--- a/exe/Server/Server.hs+++ b/exe/Server/Server.hs@@ -1,6 +1,7 @@module Server whereimport API+import qualified Data.Aeson as Aimport Data.ByteString.Lazy (fromStrict)import qualified Data.Sequence as Seqimport Network.Wai.Handler.Warp@@ -10,7 +11,6 @@ import Protolude hiding (fromStrict)import Radicleimport Servantimport qualified STMContainers.Map as STMMap-import qualified Data.Aeson as A-- * Maindiff --git a/src/Radicle/Internal.hs b/src/Radicle/Internal.hsindex 86369ee..979d5fc 100644--- a/src/Radicle/Internal.hs+++ b/src/Radicle/Internal.hs@@ -7,11 +7,11 @@ import Protoludeimport Radicle.Internal.CLI as Ximport Radicle.Internal.Core as X+import Radicle.Internal.Effects as Ximport Radicle.Internal.Interpret as Ximport Radicle.Internal.Parse as Ximport Radicle.Internal.Pretty as Ximport Radicle.Internal.Primops as X-import Radicle.Internal.Effects as Ximport qualified Text.Megaparsec as Mdiff --git a/src/Radicle/Internal/CLI.hs b/src/Radicle/Internal/CLI.hsindex 388f69b..4ec4a2b 100644--- a/src/Radicle/Internal/CLI.hs+++ b/src/Radicle/Internal/CLI.hs@@ -1,4 +1,4 @@-module Radicle.Internal.CLI+module Radicle.Internal.CLI( getConfig, getHistory)diff --git a/src/Radicle/Internal/Core.hs b/src/Radicle/Internal/Core.hsindex 1249018..d21680d 100644--- a/src/Radicle/Internal/Core.hs+++ b/src/Radicle/Internal/Core.hs@@ -4,14 +4,14 @@ module Radicle.Internal.Core whereimport Protolude hiding (TypeError, (<>))import Codec.Serialise (Serialise)-import Control.Monad.Except (ExceptT(..), MonadError, runExceptT,- throwError)+import Control.Monad.Except+ (ExceptT(..), MonadError, runExceptT, throwError)import Control.Monad.State-import Data.Aeson (ToJSON(..), FromJSON(..))+import Data.Aeson (FromJSON(..), ToJSON(..))import qualified Data.Aeson as Aimport Data.Data (Data)-import qualified Data.IntMap as IntMapimport qualified Data.HashMap.Strict as HashMap+import qualified Data.IntMap as IntMapimport Data.List.NonEmpty (NonEmpty)import qualified Data.List.NonEmpty as NonEmptyimport qualified Data.Map as Map@@ -118,7 +118,7 @@ instance Serialise Value-- Should just be a prismisAtom :: Value -> Maybe IdentisAtom (Atom i) = pure i-isAtom _ = Nothing+isAtom _ = Nothinginstance A.FromJSON Value whereparseJSON = \case@@ -163,7 +163,7 @@ maybeJson = \case_ -> NothingwhereisStr (String s) = pure s- isStr _ = Nothing+ isStr _ = Nothing-- | An identifier in the language.--diff --git a/src/Radicle/Internal/Effects.hs b/src/Radicle/Internal/Effects.hsindex 0a27858..5118b2b 100644--- a/src/Radicle/Internal/Effects.hs+++ b/src/Radicle/Internal/Effects.hs@@ -6,16 +6,22 @@ import qualified Data.Map as Mapimport qualified Data.Text as Timport Data.Text.Prettyprint.Doc (pretty)import Data.Text.Prettyprint.Doc.Render.Terminal (putDoc)-import System.Console.Haskeline (CompletionFunc, InputT, completeWord,- defaultSettings, historyFile,- runInputT, setComplete,- simpleCompletion)+import System.Console.Haskeline+ ( CompletionFunc+ , InputT+ , completeWord+ , defaultSettings+ , historyFile+ , runInputT+ , setComplete+ , simpleCompletion+ )import Radicle.Internal.Core+import Radicle.Internal.Effects.Capabilitiesimport Radicle.Internal.Interpretimport Radicle.Internal.Prettyimport Radicle.Internal.Primops-import Radicle.Internal.Effects.Capabilitiesdiff --git a/src/Radicle/Internal/Effects/Capabilities.hs b/src/Radicle/Internal/Effects/Capabilities.hsindex e993845..da21783 100644--- a/src/Radicle/Internal/Effects/Capabilities.hs+++ b/src/Radicle/Internal/Effects/Capabilities.hs@@ -10,8 +10,8 @@ import Protoludeimport Data.Text.Prettyprint.Doc (PageWidth)import System.Console.Haskeline#ifdef ghcjs_HOST_OS-import GHCJS.DOM.XMLHttpRequest (getResponseText, newXMLHttpRequest,- openSimple, send)+import GHCJS.DOM.XMLHttpRequest+ (getResponseText, newXMLHttpRequest, openSimple, send)#endifimport Radicle.Internal.Corediff --git a/src/Radicle/Internal/Orphans.hs b/src/Radicle/Internal/Orphans.hsindex 2d5638e..48bf56e 100644--- a/src/Radicle/Internal/Orphans.hs+++ b/src/Radicle/Internal/Orphans.hs@@ -1,10 +1,10 @@{-# OPTIONS_GHC -fno-warn-orphans #-}module Radicle.Internal.Orphans () where-import Protolude-import Prelude (fail)-import Codec.Serialise (Serialise(..))-import Data.Scientific+import Codec.Serialise (Serialise(..))+import Data.Scientific+import Prelude (fail)+import Protoludeinstance Serialise Scientific whereencode = encode . (show :: Scientific -> Text)diff --git a/src/Radicle/Internal/Parse.hs b/src/Radicle/Internal/Parse.hsindex ee562e5..a53524a 100644--- a/src/Radicle/Internal/Parse.hs+++ b/src/Radicle/Internal/Parse.hs@@ -7,9 +7,20 @@ import Data.List.NonEmpty (NonEmpty((:|)))import qualified Data.Map as Mapimport qualified Data.Text as Timport GHC.Exts (IsString(..))-import Text.Megaparsec (ParsecT, State(..), between, choice,- defaultTabWidth, eof, initialPos, manyTill,- runParserT', sepBy, try, (<?>))+import Text.Megaparsec+ ( ParsecT+ , State(..)+ , between+ , choice+ , defaultTabWidth+ , eof+ , initialPos+ , manyTill+ , runParserT'+ , sepBy+ , try+ , (<?>)+ )import qualified Text.Megaparsec as Mimport Text.Megaparsec.Char (char, satisfy, space1)import qualified Text.Megaparsec.Char.Lexer as Ldiff --git a/src/Radicle/Internal/Pretty.hs b/src/Radicle/Internal/Pretty.hsindex c51a419..90cfc35 100644--- a/src/Radicle/Internal/Pretty.hs+++ b/src/Radicle/Internal/Pretty.hs@@ -29,9 +29,9 @@ instance Pretty Value whereBoolean True -> "#t"Boolean False -> "#f"List vs -> case vs of- [] -> "()"+ [] -> "()"[v'] -> parens $ pretty v'- _ -> parens $ hang 1 (sep $ pretty <$> vs)+ _ -> parens $ hang 1 (sep $ pretty <$> vs)Primop i -> pretty iDict mp -> braces . align $sep [ pretty k <+> pretty valdiff --git a/src/Radicle/Internal/Primops.hs b/src/Radicle/Internal/Primops.hsindex 1b19f0c..7217806 100644--- a/src/Radicle/Internal/Primops.hs+++ b/src/Radicle/Internal/Primops.hs@@ -12,11 +12,11 @@ module Radicle.Internal.Primopsimport Protolude hiding (TypeError)+import qualified Data.Aeson as Aesonimport qualified Data.IntMap as IntMapimport qualified Data.Map as Mapimport Data.Scientific (Scientific, floatingOrInteger)import GHC.Exts (IsList(..))-import qualified Data.Aeson as Aesonimport Radicle.Internal.Coreimport Radicle.Internal.Parse