Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply formats again #1824

Merged
merged 3 commits into from May 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ghcide/exe/Main.hs
Expand Up @@ -22,11 +22,11 @@ import Development.IDE (Logger (Logger),
Priority (Info), action)
import Development.IDE.Core.OfInterest (kick)
import Development.IDE.Core.Rules (mainRule)
import Development.IDE.Graph (ShakeOptions (shakeThreads))
import qualified Development.IDE.Main as Main
import qualified Development.IDE.Plugin.HLS.GhcIde as GhcIde
import qualified Development.IDE.Plugin.Test as Test
import Development.IDE.Types.Options
import Development.IDE.Graph (ShakeOptions (shakeThreads))
import Ide.Plugin.Config (Config (checkParents, checkProject))
import Ide.Plugin.ConfigUtils (pluginsToDefaultConfig,
pluginsToVSCodeExtensionSchema)
Expand Down
2 changes: 1 addition & 1 deletion ghcide/session-loader/Development/IDE/Session.hs
Expand Up @@ -143,7 +143,7 @@ loadWithImplicitCradle :: Maybe FilePath
loadWithImplicitCradle mHieYaml rootDir = do
crdl <- case mHieYaml of
Just yaml -> HieBios.loadCradle yaml
Nothing -> loadImplicitHieCradle $ addTrailingPathSeparator rootDir
Nothing -> loadImplicitHieCradle $ addTrailingPathSeparator rootDir
return crdl

getInitialGhcLibDirDefault :: IO (Maybe LibDir)
Expand Down
8 changes: 4 additions & 4 deletions ghcide/src/Control/Concurrent/Strict.hs
Expand Up @@ -4,11 +4,11 @@ module Control.Concurrent.Strict
,module Control.Concurrent.Extra
) where

import Control.Concurrent.Extra hiding (modifyVar, modifyVar_)
import Control.Concurrent.Extra hiding (modifyVar, modifyVar_)
import qualified Control.Concurrent.Extra as Extra
import Control.Exception (evaluate)
import Data.Tuple.Extra (dupe)
import Control.Monad (void)
import Control.Exception (evaluate)
import Control.Monad (void)
import Data.Tuple.Extra (dupe)

-- | Strict modification that returns the new value
modifyVar' :: Var a -> (a -> a) -> IO a
Expand Down
4 changes: 2 additions & 2 deletions ghcide/src/Development/IDE.hs
Expand Up @@ -44,12 +44,12 @@ import Development.IDE.Core.Shake as X (FastResult (..),
use_, uses, uses_)
import Development.IDE.GHC.Error as X
import Development.IDE.GHC.Util as X
import Development.IDE.Graph as X (Action, RuleResult,
Rules, action)
import Development.IDE.Plugin as X
import Development.IDE.Types.Diagnostics as X
import Development.IDE.Types.HscEnvEq as X (HscEnvEq (..),
hscEnv,
hscEnvWithImportPaths)
import Development.IDE.Types.Location as X
import Development.IDE.Types.Logger as X
import Development.IDE.Graph as X (Action, RuleResult,
Rules, action)
2 changes: 1 addition & 1 deletion ghcide/src/Development/IDE/Core/Actions.hs
Expand Up @@ -28,9 +28,9 @@ import Development.IDE.GHC.Compat hiding (TargetFile,
parseModule,
typecheckModule,
writeHieFile)
import Development.IDE.Graph
import qualified Development.IDE.Spans.AtPoint as AtPoint
import Development.IDE.Types.Location
import Development.IDE.Graph
import qualified HieDb
import Language.LSP.Types (DocumentHighlight (..),
SymbolInformation (..))
Expand Down
8 changes: 4 additions & 4 deletions ghcide/src/Development/IDE/Core/Debouncer.hs
Expand Up @@ -11,10 +11,10 @@ module Development.IDE.Core.Debouncer
import Control.Concurrent.Async
import Control.Concurrent.Strict
import Control.Exception
import Control.Monad (join)
import Data.Foldable (traverse_)
import Data.HashMap.Strict (HashMap)
import qualified Data.HashMap.Strict as Map
import Control.Monad (join)
import Data.Foldable (traverse_)
import Data.HashMap.Strict (HashMap)
import qualified Data.HashMap.Strict as Map
import Data.Hashable
import System.Time.Extra

Expand Down
2 changes: 1 addition & 1 deletion ghcide/src/Development/IDE/Core/FileExists.hs
Expand Up @@ -22,9 +22,9 @@ import Development.IDE.Core.FileStore
import Development.IDE.Core.IdeConfiguration
import Development.IDE.Core.RuleTypes
import Development.IDE.Core.Shake
import Development.IDE.Graph
import Development.IDE.Types.Location
import Development.IDE.Types.Options
import Development.IDE.Graph
import Language.LSP.Server hiding (getVirtualFile)
import Language.LSP.Types
import Language.LSP.Types.Capabilities
Expand Down
3 changes: 2 additions & 1 deletion ghcide/src/Development/IDE/Core/FileStore.hs
Expand Up @@ -55,7 +55,8 @@ import System.IO.Error
#ifdef mingw32_HOST_OS
import qualified System.Directory as Dir
#else
import System.Posix.Files ( getFileStatus, modificationTimeHiRes)
import System.Posix.Files (getFileStatus,
modificationTimeHiRes)
#endif

import qualified Development.IDE.Types.Logger as L
Expand Down
2 changes: 1 addition & 1 deletion ghcide/src/Development/IDE/Core/IdeConfiguration.hs
Expand Up @@ -20,8 +20,8 @@ import Data.HashSet (HashSet, singleton)
import Data.Hashable (Hashed, hashed, unhashed)
import Data.Text (Text, isPrefixOf)
import Development.IDE.Core.Shake
import Development.IDE.Types.Location
import Development.IDE.Graph
import Development.IDE.Types.Location
import Language.LSP.Types
import System.FilePath (isRelative)

Expand Down
20 changes: 13 additions & 7 deletions ghcide/src/Development/IDE/Core/Rules.hs
Expand Up @@ -111,7 +111,10 @@ import Development.IDE.GHC.Compat hiding
writeHieFile)
import Development.IDE.GHC.Error
import Development.IDE.GHC.ExactPrint
import Development.IDE.GHC.Util hiding (modifyDynFlags)
import Development.IDE.GHC.Util hiding
(modifyDynFlags)
import Development.IDE.Graph
import Development.IDE.Graph.Classes hiding (get, put)
import Development.IDE.Import.DependencyInformation
import Development.IDE.Import.FindImports
import qualified Development.IDE.Spans.AtPoint as AtPoint
Expand All @@ -122,8 +125,6 @@ import Development.IDE.Types.HscEnvEq
import Development.IDE.Types.Location
import qualified Development.IDE.Types.Logger as L
import Development.IDE.Types.Options
import Development.IDE.Graph
import Development.IDE.Graph.Classes hiding (get, put)
import Fingerprint
import GHC.Generics (Generic)
import GHC.IO.Encoding
Expand All @@ -140,11 +141,16 @@ import Module
import System.Directory (canonicalizePath)
import TcRnMonad (tcg_dependent_files)

import Ide.Plugin.Properties (HasProperty, KeyNameProxy, Properties, ToHsType, useProperty)
import Ide.Types (PluginId, DynFlagsModifications(dynFlagsModifyGlobal, dynFlagsModifyParser))
import Data.Default (def)
import Ide.PluginUtils (configForPlugin)
import Control.Applicative
import Data.Default (def)
import Ide.Plugin.Properties (HasProperty,
KeyNameProxy,
Properties,
ToHsType,
useProperty)
import Ide.PluginUtils (configForPlugin)
import Ide.Types (DynFlagsModifications (dynFlagsModifyGlobal, dynFlagsModifyParser),
PluginId)

-- | This is useful for rules to convert rules that can only produce errors or
-- a result into the more general IdeResult type that supports producing
Expand Down
4 changes: 2 additions & 2 deletions ghcide/src/Development/IDE/Core/Shake.hs
Expand Up @@ -148,8 +148,8 @@ import Control.Exception.Extra hiding (bracket_)
import Data.Default
import HieDb.Types
import Ide.Plugin.Config
import qualified Ide.PluginUtils as HLS
import Ide.Types (PluginId)
import qualified Ide.PluginUtils as HLS
import Ide.Types (PluginId)

-- | We need to serialize writes to the database, so we send any function that
-- needs to write to the database over the channel, where it will be picked up by
Expand Down
4 changes: 2 additions & 2 deletions ghcide/src/Development/IDE/Core/Tracing.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE NoApplicativeDo #-}
{-# LANGUAGE CPP #-}
module Development.IDE.Core.Tracing
( otTracedHandler
, otTracedAction
Expand Down Expand Up @@ -32,12 +32,12 @@ import Debug.Trace.Flags (userTracingEnabled)
import Development.IDE.Core.RuleTypes (GhcSession (GhcSession),
GhcSessionDeps (GhcSessionDeps),
GhcSessionIO (GhcSessionIO))
import Development.IDE.Graph (Action, actionBracket)
import Development.IDE.Types.Location (Uri (..))
import Development.IDE.Types.Logger (Logger, logDebug, logInfo)
import Development.IDE.Types.Shake (Key (..), Value,
ValueWithDiagnostics (..),
Values)
import Development.IDE.Graph (Action, actionBracket)
import Foreign.Storable (Storable (sizeOf))
import HeapSize (recursiveSize, runHeapsize)
import Ide.PluginUtils (installSigUsr1Handler)
Expand Down
26 changes: 15 additions & 11 deletions ghcide/src/Development/IDE/Core/UseStale.hs
Expand Up @@ -20,19 +20,23 @@ module Development.IDE.Core.UseStale
) where

import Control.Arrow
import Control.Category (Category)
import qualified Control.Category as C
import Control.DeepSeq (NFData)
import Control.Category (Category)
import qualified Control.Category as C
import Control.DeepSeq (NFData)
import Data.Aeson
import Data.Coerce (coerce)
import Data.Functor ((<&>))
import Data.Functor.Identity (Identity(Identity))
import Data.Kind (Type)
import Data.String (fromString)
import Development.IDE (NormalizedFilePath, IdeRule, Action, Range, rangeToRealSrcSpan, realSrcSpanToRange)
import Data.Coerce (coerce)
import Data.Functor ((<&>))
import Data.Functor.Identity (Identity (Identity))
import Data.Kind (Type)
import Data.String (fromString)
import Development.IDE (Action, IdeRule,
NormalizedFilePath,
Range,
rangeToRealSrcSpan,
realSrcSpanToRange)
import qualified Development.IDE.Core.PositionMapping as P
import qualified Development.IDE.Core.Shake as IDE
import qualified FastString as FS
import qualified Development.IDE.Core.Shake as IDE
import qualified FastString as FS
import SrcLoc


Expand Down
72 changes: 34 additions & 38 deletions ghcide/src/Development/IDE/GHC/Compat.hs
@@ -1,10 +1,10 @@
-- Copyright (c) 2019 The DAML Authors. All rights reserved.
-- SPDX-License-Identifier: Apache-2.0

{-# LANGUAGE CPP #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE PatternSynonyms #-}
{-# LANGUAGE PatternSynonyms #-}
{-# OPTIONS -Wno-dodgy-imports -Wno-incomplete-uni-patterns #-}

-- | Attempt at hiding the GHC version differences we can.
Expand Down Expand Up @@ -62,60 +62,56 @@ module Development.IDE.GHC.Compat(
,isQualifiedImport) where

#if MIN_VERSION_ghc(8,10,0)
import LinkerTypes
import LinkerTypes
#endif

import StringBuffer
import Compat.HieAst (enrichHie, mkHieFile)
import Compat.HieBin
import Compat.HieTypes
import Compat.HieUtils
import qualified Data.ByteString as BS
import Data.IORef
import DynFlags hiding (ExposePackage)
import qualified DynFlags
import DynFlags hiding (ExposePackage)
import Fingerprint (Fingerprint)
import Fingerprint (Fingerprint)
import HscTypes
import MkIface
import qualified Module
import Packages
import Data.IORef
import HscTypes
import NameCache
import qualified Data.ByteString as BS
import MkIface
import TcRnTypes
import Compat.HieAst (mkHieFile,enrichHie)
import Compat.HieBin
import Compat.HieTypes
import Compat.HieUtils
import NameCache
import Packages
import StringBuffer
import TcRnTypes

#if MIN_VERSION_ghc(8,10,0)
import GHC.Hs.Extension
import GHC.Hs.Extension
#else
import HsExtension
import HsExtension
#endif

import Avail
import GHC hiding (HasSrcSpan, ModLocation, getLoc,
lookupName)
import qualified GHC
import qualified TyCoRep
import GHC hiding (
ModLocation,
HasSrcSpan,
lookupName,
getLoc
)
import Avail
#if MIN_VERSION_ghc(8,8,0)
import Data.List (foldl')
import Data.List (foldl')
#else
import Data.List (foldl', isSuffixOf)
import Data.List (foldl', isSuffixOf)
#endif

import DynamicLoading
import Plugins (Plugin(parsedResultAction), withPlugins)
import Data.Map.Strict (Map)
import Data.Map.Strict (Map)
import DynamicLoading
import Plugins (Plugin (parsedResultAction), withPlugins)

#if !MIN_VERSION_ghc(8,8,0)
import System.FilePath ((-<.>))
import System.FilePath ((-<.>))
#endif

#if !MIN_VERSION_ghc(8,8,0)
import qualified EnumSet

import System.IO
import Foreign.ForeignPtr
import Foreign.ForeignPtr
import System.IO


hPutStringBuffer :: Handle -> StringBuffer -> IO ()
Expand Down Expand Up @@ -303,8 +299,8 @@ pattern FunTy arg res <- TyCoRep.FunTy arg res
isQualifiedImport :: ImportDecl a -> Bool
#if MIN_VERSION_ghc(8,10,0)
isQualifiedImport ImportDecl{ideclQualified = NotQualified} = False
isQualifiedImport ImportDecl{} = True
isQualifiedImport ImportDecl{} = True
#else
isQualifiedImport ImportDecl{ideclQualified} = ideclQualified
isQualifiedImport ImportDecl{ideclQualified} = ideclQualified
#endif
isQualifiedImport _ = False
isQualifiedImport _ = False