Skip to content

Commit

Permalink
Run pre-commit hooks (#3059)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lunaticare
lunaticare authored Jul 28, 2022
1 parent 078fc14 commit 347a718
Show file tree
Hide file tree
Showing 48 changed files with 405 additions and 354 deletions.
16 changes: 11 additions & 5 deletions exe/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,26 @@ module Main(main) where

import Control.Monad.IO.Class (liftIO)
import Data.Function ((&))
import Data.Text (Text)
import qualified Development.IDE.Types.Logger as Logger
import Development.IDE.Types.Logger (Priority (Debug, Info, Error),
import Data.Text (Text)
import Development.IDE.Types.Logger (Doc,
Priority (Debug, Error, Info),
WithPriority (WithPriority, priority),
cfilter, cmapWithPrio,
defaultLayoutOptions,
layoutPretty,
makeDefaultStderrRecorder,
withDefaultRecorder, renderStrict, layoutPretty, defaultLayoutOptions, Doc)
renderStrict,
withDefaultRecorder)
import qualified Development.IDE.Types.Logger as Logger
import Ide.Arguments (Arguments (..),
GhcideArguments (..),
getArguments)
import Ide.Main (defaultMain)
import qualified Ide.Main as IdeMain
import Ide.PluginUtils (pluginDescToIdePlugins)
import Ide.Types (PluginDescriptor (pluginNotificationHandlers), defaultPluginDescriptor, mkPluginNotificationHandler)
import Ide.Types (PluginDescriptor (pluginNotificationHandlers),
defaultPluginDescriptor,
mkPluginNotificationHandler)
import Language.LSP.Server as LSP
import Language.LSP.Types as LSP
import qualified Plugins
Expand Down
57 changes: 32 additions & 25 deletions exe/Wrapper.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,50 +12,57 @@
module Main where

import Control.Monad.Extra
import Data.Char (isSpace)
import Data.Char (isSpace)
import Data.Default
import Data.Foldable
import Data.List
import Data.Void
import qualified Development.IDE.Session as Session
import qualified HIE.Bios.Environment as HieBios
import qualified Development.IDE.Session as Session
import qualified HIE.Bios.Environment as HieBios
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.IO
#ifndef mingw32_HOST_OS
import System.Posix.Process (executeFile)
import qualified Data.Map.Strict as Map
import qualified Data.Map.Strict as Map
import System.Posix.Process (executeFile)
#else
import System.Process
#endif
import qualified Data.Text.IO as T
import Control.Monad.Trans.Except (ExceptT, runExceptT, throwE)
import qualified Data.Text as T
import Language.LSP.Server (LspM)
import Control.Monad.IO.Class (MonadIO (liftIO))
import Control.Monad.IO.Unlift (MonadUnliftIO)
import qualified Language.LSP.Server as LSP
import qualified Development.IDE.Main as Main
import Ide.Plugin.Config (Config)
import Language.LSP.Types (RequestMessage, ResponseError, MessageActionItem (MessageActionItem), Method(Initialize), MessageType (MtError), SMethod (SWindowShowMessageRequest, SExit), ShowMessageRequestParams (ShowMessageRequestParams))
import Development.IDE.Types.Logger ( makeDefaultStderrRecorder,
cmapWithPrio,
Pretty(pretty),
Logger(Logger),
Priority(Error, Debug, Info, Warning),
Recorder(logger_),
WithPriority(WithPriority) )
import Control.Concurrent (tryPutMVar)
import Control.Monad.IO.Class (MonadIO (liftIO))
import Control.Monad.IO.Unlift (MonadUnliftIO)
import Control.Monad.Trans.Except (ExceptT, runExceptT,
throwE)
import Data.Maybe
import GHC.Stack.Types (emptyCallStack)
import Control.Concurrent (tryPutMVar)
import qualified Data.Text as T
import qualified Data.Text.IO as T
import Development.IDE.LSP.LanguageServer (runLanguageServer)
import qualified Development.IDE.Main as Main
import Development.IDE.Types.Logger (Logger (Logger),
Pretty (pretty),
Priority (Debug, Error, Info, Warning),
Recorder (logger_),
WithPriority (WithPriority),
cmapWithPrio,
makeDefaultStderrRecorder)
import GHC.Stack.Types (emptyCallStack)
import HIE.Bios.Internal.Log
import Ide.Plugin.Config (Config)
import Language.LSP.Server (LspM)
import qualified Language.LSP.Server as LSP
import Language.LSP.Types (MessageActionItem (MessageActionItem),
MessageType (MtError),
Method (Initialize),
RequestMessage,
ResponseError,
SMethod (SExit, SWindowShowMessageRequest),
ShowMessageRequestParams (ShowMessageRequestParams))

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

Expand Down
29 changes: 14 additions & 15 deletions ghcide/bench/lib/Experiments.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ import Development.IDE.Test (getBuildEdgesCount,
getBuildKeysBuilt,
getBuildKeysChanged,
getBuildKeysVisited,
getStoredKeys,
getRebuildsCount,
)
getStoredKeys)
import Development.IDE.Test.Diagnostic
import Development.Shake (CmdOption (Cwd, FileStdout),
cmd_)
Expand Down Expand Up @@ -428,20 +427,20 @@ runBenchmarksFun dir allBenchmarks = do
}

data BenchRun = BenchRun
{ startup :: !Seconds,
runSetup :: !Seconds,
runExperiment :: !Seconds,
userWaits :: !Seconds,
delayedWork :: !Seconds,
firstResponse :: !Seconds,
{ startup :: !Seconds,
runSetup :: !Seconds,
runExperiment :: !Seconds,
userWaits :: !Seconds,
delayedWork :: !Seconds,
firstResponse :: !Seconds,
firstResponseDelayed :: !Seconds,
rulesBuilt :: !Int,
rulesChanged :: !Int,
rulesVisited :: !Int,
rulesTotal :: !Int,
edgesTotal :: !Int,
rebuildsTotal :: !Int,
success :: !Bool
rulesBuilt :: !Int,
rulesChanged :: !Int,
rulesVisited :: !Int,
rulesTotal :: !Int,
edgesTotal :: !Int,
rebuildsTotal :: !Int,
success :: !Bool
}

badRun :: BenchRun
Expand Down
78 changes: 42 additions & 36 deletions ghcide/exe/Main.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,50 @@

module Main(main) where

import Arguments (Arguments (..),
getArguments)
import Control.Monad.Extra (unless)
import Control.Monad.IO.Class (liftIO)
import Data.Default (def)
import Data.Function ((&))
import Data.Version (showVersion)
import Development.GitRev (gitHash)
import Development.IDE (action)
import Development.IDE.Core.OfInterest (kick)
import Development.IDE.Core.Rules (mainRule)
import qualified Development.IDE.Core.Rules as Rules
import Development.IDE.Core.Tracing (withTelemetryLogger)
import qualified Development.IDE.Main as IDEMain
import Arguments (Arguments (..),
getArguments)
import Control.Monad.Extra (unless)
import Control.Monad.IO.Class (liftIO)
import Data.Default (def)
import Data.Function ((&))
import Data.Version (showVersion)
import Development.GitRev (gitHash)
import Development.IDE (action)
import Development.IDE.Core.OfInterest (kick)
import Development.IDE.Core.Rules (mainRule)
import qualified Development.IDE.Core.Rules as Rules
import Development.IDE.Core.Tracing (withTelemetryLogger)
import qualified Development.IDE.Main as IDEMain
import qualified Development.IDE.Monitoring.EKG as EKG
import qualified Development.IDE.Monitoring.OpenTelemetry as OpenTelemetry
import qualified Development.IDE.Monitoring.EKG as EKG
import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
import Development.IDE.Types.Logger (Logger (Logger),
LoggingColumn (DataColumn, PriorityColumn),
Pretty (pretty),
Priority (Debug, Info, Error),
WithPriority (WithPriority, priority),
cfilter, cmapWithPrio,
makeDefaultStderrRecorder, layoutPretty, renderStrict, defaultLayoutOptions)
import qualified Development.IDE.Types.Logger as Logger
import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
import Development.IDE.Types.Logger (Logger (Logger),
LoggingColumn (DataColumn, PriorityColumn),
Pretty (pretty),
Priority (Debug, Error, Info),
WithPriority (WithPriority, priority),
cfilter,
cmapWithPrio,
defaultLayoutOptions,
layoutPretty,
makeDefaultStderrRecorder,
renderStrict)
import qualified Development.IDE.Types.Logger as Logger
import Development.IDE.Types.Options
import GHC.Stack (emptyCallStack)
import Language.LSP.Server as LSP
import Language.LSP.Types as LSP
import Ide.Plugin.Config (Config (checkParents, checkProject))
import Ide.PluginUtils (pluginDescToIdePlugins)
import Ide.Types (PluginDescriptor (pluginNotificationHandlers), defaultPluginDescriptor, mkPluginNotificationHandler)
import Paths_ghcide (version)
import qualified System.Directory.Extra as IO
import System.Environment (getExecutablePath)
import System.Exit (exitSuccess)
import System.IO (hPutStrLn, stderr)
import System.Info (compilerVersion)
import GHC.Stack (emptyCallStack)
import Ide.Plugin.Config (Config (checkParents, checkProject))
import Ide.PluginUtils (pluginDescToIdePlugins)
import Ide.Types (PluginDescriptor (pluginNotificationHandlers),
defaultPluginDescriptor,
mkPluginNotificationHandler)
import Language.LSP.Server as LSP
import Language.LSP.Types as LSP
import Paths_ghcide (version)
import qualified System.Directory.Extra as IO
import System.Environment (getExecutablePath)
import System.Exit (exitSuccess)
import System.Info (compilerVersion)
import System.IO (hPutStrLn, stderr)

data Log
= LogIDEMain IDEMain.Log
Expand Down
6 changes: 3 additions & 3 deletions ghcide/session-loader/Development/IDE/Session.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import qualified Data.ByteString.Char8 as B
import Data.Default
import Data.Either.Extra
import Data.Function
import qualified Data.HashMap.Strict as HM
import Data.Hashable
import qualified Data.HashMap.Strict as HM
import Data.IORef
import Data.List
import qualified Data.Map.Strict as Map
Expand Down Expand Up @@ -87,6 +87,7 @@ import Data.Void
import Control.Concurrent.STM.Stats (atomically, modifyTVar',
readTVar, writeTVar)
import Control.Concurrent.STM.TQueue
import Control.Monad.IO.Unlift (MonadUnliftIO)
import Data.Foldable (for_)
import Data.HashMap.Strict (HashMap)
import Data.HashSet (HashSet)
Expand All @@ -97,9 +98,8 @@ import Development.IDE.Types.Shake (WithHieDb)
import HieDb.Create
import HieDb.Types
import HieDb.Utils
import System.Random (RandomGen)
import qualified System.Random as Random
import Control.Monad.IO.Unlift (MonadUnliftIO)
import System.Random (RandomGen)

data Log
= LogSettingInitialDynFlags
Expand Down
2 changes: 1 addition & 1 deletion ghcide/session-loader/Development/IDE/Session/VersionCheck.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
-- See https://github.com/haskell/ghcide/pull/697
module Development.IDE.Session.VersionCheck (ghcVersionChecker) where

import GHC.Check
import GHC.Check
-- Only use this for checking against the compile time GHC libDir!
-- Use getRuntimeGhcLibDir from hie-bios instead for everything else
-- otherwise binaries will not be distributable since paths will be baked into them
Expand Down
6 changes: 3 additions & 3 deletions ghcide/src/Development/IDE.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@ import Development.IDE.Core.FileStore as X (getFileContents)
import Development.IDE.Core.IdeConfiguration as X (IdeConfiguration (..),
isWorkspaceFile)
import Development.IDE.Core.OfInterest as X (getFilesOfInterestUntracked)
import Development.IDE.Core.RuleTypes as X
import Development.IDE.Core.Rules as X (getClientConfigAction,
getParsedModule)
import Development.IDE.Core.RuleTypes as X
import Development.IDE.Core.Service as X (runAction)
import Development.IDE.Core.Shake as X (FastResult (..),
IdeAction (..),
IdeRule, IdeState,
RuleBody (..),
ShakeExtras,
VFSModified (..),
actionLogger,
define,
defineEarlyCutoff,
Expand All @@ -40,8 +41,7 @@ import Development.IDE.Core.Shake as X (FastResult (..),
useWithStaleFast,
useWithStaleFast',
useWithStale_,
use_, uses, uses_,
VFSModified(..))
use_, uses, uses_)
import Development.IDE.GHC.Compat as X (GhcVersion (..),
ghcVersion)
import Development.IDE.GHC.Error as X
Expand Down
Loading

0 comments on commit 347a718

Please sign in to comment.