Skip to content

Commit

Permalink
Format all files
Browse files Browse the repository at this point in the history
  • Loading branch information
Ailrun committed Feb 24, 2021
1 parent 211abd2 commit 8dc503c
Show file tree
Hide file tree
Showing 139 changed files with 2,894 additions and 2,844 deletions.
19 changes: 10 additions & 9 deletions GenChangelogs.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
build-depends: base, process, text, github, time
-}

{-# LANGUAGE OverloadedStrings, RecordWildCards #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RecordWildCards #-}

import Control.Monad
import Data.List
import Data.Maybe
import qualified Data.Text as T
import Data.Time.Format.ISO8601
import Data.Time.LocalTime
import System.Process
import GitHub
import Control.Monad
import Data.List
import Data.Maybe
import qualified Data.Text as T
import Data.Time.Format.ISO8601
import Data.Time.LocalTime
import GitHub
import System.Process

main = do
callCommand "git fetch --tags"
Expand Down
7 changes: 3 additions & 4 deletions exe/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
{-# LANGUAGE RecordWildCards #-}
module Main(main) where

import Ide.Arguments (Arguments (..), LspArguments (..),
getArguments)
import Ide.Main (defaultMain)
import Ide.Arguments (Arguments (..), LspArguments (..), getArguments)
import Ide.Main (defaultMain)
import Main.Utf8 (withUtf8)
import Plugins
import Main.Utf8 (withUtf8)

main :: IO ()
main = withUtf8 $ do
Expand Down
42 changes: 21 additions & 21 deletions exe/Plugins.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2,77 +2,77 @@
{-# LANGUAGE OverloadedStrings #-}
module Plugins where

import Ide.Types (IdePlugins)
import Ide.PluginUtils (pluginDescToIdePlugins)
import Ide.PluginUtils (pluginDescToIdePlugins)
import Ide.Types (IdePlugins)

-- fixed plugins
import Ide.Plugin.Example as Example
import Ide.Plugin.Example2 as Example2
import Development.IDE (IdeState)
import Development.IDE.Plugin.HLS.GhcIde as GhcIde
import Development.IDE (IdeState)
import Development.IDE.Plugin.HLS.GhcIde as GhcIde
import Ide.Plugin.Example as Example
import Ide.Plugin.Example2 as Example2

-- haskell-language-server optional plugins

#if class
import Ide.Plugin.Class as Class
import Ide.Plugin.Class as Class
#endif

#if haddockComments
import Ide.Plugin.HaddockComments as HaddockComments
import Ide.Plugin.HaddockComments as HaddockComments
#endif

#if eval
import Ide.Plugin.Eval as Eval
import Ide.Plugin.Eval as Eval
#endif

#if importLens
import Ide.Plugin.ExplicitImports as ExplicitImports
import Ide.Plugin.ExplicitImports as ExplicitImports
#endif

#if retrie
import Ide.Plugin.Retrie as Retrie
import Ide.Plugin.Retrie as Retrie
#endif

#if tactic
import Ide.Plugin.Tactic as Tactic
import Ide.Plugin.Tactic as Tactic
#endif

#if hlint
import Ide.Plugin.Hlint as Hlint
import Ide.Plugin.Hlint as Hlint
#endif

#if moduleName
import Ide.Plugin.ModuleName as ModuleName
import Ide.Plugin.ModuleName as ModuleName
#endif

#if pragmas
import Ide.Plugin.Pragmas as Pragmas
import Ide.Plugin.Pragmas as Pragmas
#endif

#if splice
import Ide.Plugin.Splice as Splice
import Ide.Plugin.Splice as Splice
#endif

-- formatters

#if floskell
import Ide.Plugin.Floskell as Floskell
import Ide.Plugin.Floskell as Floskell
#endif

#if fourmolu
import Ide.Plugin.Fourmolu as Fourmolu
import Ide.Plugin.Fourmolu as Fourmolu
#endif

#if ormolu
import Ide.Plugin.Ormolu as Ormolu
import Ide.Plugin.Ormolu as Ormolu
#endif

#if stylishHaskell
import Ide.Plugin.StylishHaskell as StylishHaskell
import Ide.Plugin.StylishHaskell as StylishHaskell
#endif

#if AGPL && brittany
import Ide.Plugin.Brittany as Brittany
import Ide.Plugin.Brittany as Brittany
#endif

-- ---------------------------------------------------------------------
Expand Down
38 changes: 19 additions & 19 deletions exe/Wrapper.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
-- https://github.com/alanz/vscode-hie-server
module Main where

import Control.Monad.Extra
import Data.Default
import Data.Foldable
import Data.List
import Data.Void
import Development.IDE.Session (findCradle)
import HIE.Bios hiding (findCradle)
import HIE.Bios.Environment
import HIE.Bios.Types
import Ide.Arguments
import Ide.Version
import System.Directory
import System.Environment
import System.Exit
import System.FilePath
import System.IO
import System.Info
import System.Process
import Control.Monad.Extra
import Data.Default
import Data.Foldable
import Data.List
import Data.Void
import Development.IDE.Session (findCradle)
import HIE.Bios hiding (findCradle)
import HIE.Bios.Environment
import HIE.Bios.Types
import Ide.Arguments
import Ide.Version
import System.Directory
import System.Environment
import System.Exit
import System.FilePath
import System.IO
import System.Info
import System.Process

-- ---------------------------------------------------------------------

Expand Down Expand Up @@ -50,7 +50,7 @@ launchHaskellLanguageServer :: Arguments -> IO ()
launchHaskellLanguageServer parsedArgs = do
case parsedArgs of
LspMode LspArguments{..} -> whenJust argsCwd setCurrentDirectory
_ -> pure ()
_ -> pure ()

d <- getCurrentDirectory

Expand Down
8 changes: 4 additions & 4 deletions ghcide/bench/exe/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@

{-# LANGUAGE ImplicitParams #-}

import Control.Exception.Safe
import Experiments
import Options.Applicative
import System.IO
import Control.Exception.Safe
import Control.Monad
import Experiments
import Options.Applicative
import System.IO

optsP :: Parser (Config, Bool)
optsP = (,) <$> configP <*> switch (long "no-clean")
Expand Down
46 changes: 23 additions & 23 deletions ghcide/bench/hist/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,24 @@
> cabal bench --benchmark-options "bench-results/HEAD/results.csv bench-results/HEAD/edit.diff.svg"
-}
{-# LANGUAGE DeriveAnyClass #-}
{-# LANGUAGE DerivingStrategies#-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE DeriveAnyClass #-}
{-# LANGUAGE DerivingStrategies #-}
{-# LANGUAGE TypeFamilies #-}
{-# OPTIONS -Wno-orphans #-}

import Data.Foldable (find)
import Data.Yaml (FromJSON (..), decodeFileThrow)
import Development.Benchmark.Rules
import Development.Shake
import Experiments.Types (Example, exampleToOptions)
import qualified Experiments.Types as E
import GHC.Generics (Generic)
import Numeric.Natural (Natural)
import Development.Shake.Classes
import System.Console.GetOpt
import Data.Maybe
import Control.Monad.Extra
import System.FilePath
import Control.Monad.Extra
import Data.Foldable (find)
import Data.Maybe
import Data.Yaml (FromJSON (..), decodeFileThrow)
import Development.Benchmark.Rules
import Development.Shake
import Development.Shake.Classes
import Experiments.Types (Example, exampleToOptions)
import qualified Experiments.Types as E
import GHC.Generics (Generic)
import Numeric.Natural (Natural)
import System.Console.GetOpt
import System.FilePath


configPath :: FilePath
Expand All @@ -82,7 +82,7 @@ main = shakeArgsWith shakeOpts [configOpt] $ \configs wants -> pure $ Just $ do
_configStatic <- createBuildSystem config
case wants of
[] -> want ["all"]
_ -> want wants
_ -> want wants

ghcideBuildRules :: MkBuildRules BuildSystem
ghcideBuildRules = MkBuildRules findGhcForBuildSystem "ghcide" projectDepends buildGhcide
Expand All @@ -95,13 +95,13 @@ ghcideBuildRules = MkBuildRules findGhcForBuildSystem "ghcide" projectDepends bu
--------------------------------------------------------------------------------

data Config buildSystem = Config
{ experiments :: [Unescaped String],
examples :: [Example],
samples :: Natural,
versions :: [GitCommit],
{ experiments :: [Unescaped String],
examples :: [Example],
samples :: Natural,
versions :: [GitCommit],
-- | Output folder ('foo' works, 'foo/bar' does not)
outputFolder :: String,
buildTool :: buildSystem,
outputFolder :: String,
buildTool :: buildSystem,
profileInterval :: Maybe Double
}
deriving (Generic, Show)
Expand Down

0 comments on commit 8dc503c

Please sign in to comment.