diff --git a/exe/Main.hs b/exe/Main.hs index c519bdd5ea..fc118eaffb 100644 --- a/exe/Main.hs +++ b/exe/Main.hs @@ -1,6 +1,5 @@ -- Copyright (c) 2019 The DAML Authors. All rights reserved. -- SPDX-License-Identifier: Apache-2.0 -{-# LANGUAGE CPP #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} module Main(main) where @@ -32,11 +31,7 @@ import Ide.Types (PluginDescriptor (pluginNotificat mkPluginNotificationHandler) import Language.LSP.Server as LSP import Language.LSP.Types as LSP -#if MIN_VERSION_prettyprinter(1,7,0) import Prettyprinter (Pretty (pretty), vsep) -#else -import Data.Text.Prettyprint.Doc (Pretty (pretty), vsep) -#endif data Log = LogIdeMain IdeMain.Log diff --git a/ghcide/src/Development/IDE/Types/Diagnostics.hs b/ghcide/src/Development/IDE/Types/Diagnostics.hs index 1420995be7..c8de1e8e10 100644 --- a/ghcide/src/Development/IDE/Types/Diagnostics.hs +++ b/ghcide/src/Development/IDE/Types/Diagnostics.hs @@ -17,19 +17,19 @@ module Development.IDE.Types.Diagnostics ( IdeResultNoDiagnosticsEarlyCutoff) where import Control.DeepSeq -import Data.Maybe as Maybe -import qualified Data.Text as T -import Data.Text.Prettyprint.Doc -import Data.Text.Prettyprint.Doc.Render.Terminal (Color (..), color) -import qualified Data.Text.Prettyprint.Doc.Render.Terminal as Terminal -import Data.Text.Prettyprint.Doc.Render.Text +import Data.Maybe as Maybe +import qualified Data.Text as T import Language.LSP.Diagnostics -import Language.LSP.Types as LSP (Diagnostic (..), - DiagnosticSeverity (..), - DiagnosticSource, - List (..)) - -import Data.ByteString (ByteString) +import Language.LSP.Types as LSP (Diagnostic (..), + DiagnosticSeverity (..), + DiagnosticSource, + List (..)) +import Prettyprinter +import Prettyprinter.Render.Terminal (Color (..), color) +import qualified Prettyprinter.Render.Terminal as Terminal +import Prettyprinter.Render.Text + +import Data.ByteString (ByteString) import Development.IDE.Types.Location diff --git a/ghcide/src/Development/IDE/Types/Logger.hs b/ghcide/src/Development/IDE/Types/Logger.hs index 416049a5ab..f42c54237f 100644 --- a/ghcide/src/Development/IDE/Types/Logger.hs +++ b/ghcide/src/Development/IDE/Types/Logger.hs @@ -1,7 +1,6 @@ -- Copyright (c) 2019 The DAML Authors. All rights reserved. -- SPDX-License-Identifier: Apache-2.0 -{-# LANGUAGE CPP #-} {-# LANGUAGE RankNTypes #-} -- | This is a compatibility module that abstracts over the -- concrete choice of logging framework so users can plug in whatever @@ -30,55 +29,43 @@ module Development.IDE.Types.Logger , toCologActionWithPrio ) where -import Control.Concurrent (myThreadId) -import Control.Concurrent.Extra (Lock, newLock, withLock) -import Control.Concurrent.STM (atomically, - flushTBQueue, - isFullTBQueue, - newTBQueueIO, newTVarIO, - readTVarIO, - writeTBQueue, writeTVar) -import Control.Exception (IOException) -import Control.Monad (unless, when, (>=>)) -import Control.Monad.IO.Class (MonadIO (liftIO)) -import Data.Foldable (for_) -import Data.Functor.Contravariant (Contravariant (contramap)) -import Data.Maybe (fromMaybe) -import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Text as Text -import qualified Data.Text.IO as Text -import Data.Time (defaultTimeLocale, - formatTime, - getCurrentTime) -import GHC.Stack (CallStack, HasCallStack, - SrcLoc (SrcLoc, srcLocModule, srcLocStartCol, srcLocStartLine), - callStack, getCallStack, - withFrozenCallStack) +import Colog.Core (LogAction (..), Severity, + WithSeverity (..)) +import qualified Colog.Core as Colog +import Control.Concurrent (myThreadId) +import Control.Concurrent.Extra (Lock, newLock, withLock) +import Control.Concurrent.STM (atomically, flushTBQueue, + isFullTBQueue, newTBQueueIO, + newTVarIO, readTVarIO, + writeTBQueue, writeTVar) +import Control.Exception (IOException) +import Control.Monad (unless, when, (>=>)) +import Control.Monad.IO.Class (MonadIO (liftIO)) +import Data.Foldable (for_) +import Data.Functor.Contravariant (Contravariant (contramap)) +import Data.Maybe (fromMaybe) +import Data.Text (Text) +import qualified Data.Text as T +import qualified Data.Text as Text +import qualified Data.Text.IO as Text +import Data.Time (defaultTimeLocale, formatTime, + getCurrentTime) +import GHC.Stack (CallStack, HasCallStack, + SrcLoc (SrcLoc, srcLocModule, srcLocStartCol, srcLocStartLine), + callStack, getCallStack, + withFrozenCallStack) import Language.LSP.Server -import qualified Language.LSP.Server as LSP -import Language.LSP.Types (LogMessageParams (..), - MessageType (..), - SMethod (SWindowLogMessage, SWindowShowMessage), - ShowMessageParams (..)) -#if MIN_VERSION_prettyprinter(1,7,0) -import Prettyprinter as PrettyPrinterModule -import Prettyprinter.Render.Text (renderStrict) -#else -import Data.Text.Prettyprint.Doc as PrettyPrinterModule -import Data.Text.Prettyprint.Doc.Render.Text (renderStrict) -#endif -import Colog.Core (LogAction (..), - Severity, - WithSeverity (..)) -import qualified Colog.Core as Colog -import System.IO (Handle, - IOMode (AppendMode), - hClose, hFlush, - openFile, stderr) -import UnliftIO (MonadUnliftIO, - displayException, - finally, try) +import qualified Language.LSP.Server as LSP +import Language.LSP.Types (LogMessageParams (..), + MessageType (..), + SMethod (SWindowLogMessage, SWindowShowMessage), + ShowMessageParams (..)) +import Prettyprinter as PrettyPrinterModule +import Prettyprinter.Render.Text (renderStrict) +import System.IO (Handle, IOMode (AppendMode), + hClose, hFlush, openFile, stderr) +import UnliftIO (MonadUnliftIO, displayException, + finally, try) data Priority -- Don't change the ordering of this type or you will mess up the Ord diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index ec8d4f8e67..b8d43f06e6 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -40,7 +40,7 @@ common common-deps , extra , filepath , text - , prettyprinter + , prettyprinter >= 1.7 -- Default warnings in HLS common warnings diff --git a/plugins/hls-tactics-plugin/new/src/Wingman/Metaprogramming/Parser/Documentation.hs b/plugins/hls-tactics-plugin/new/src/Wingman/Metaprogramming/Parser/Documentation.hs index 44071a5ae7..0c37d6365a 100644 --- a/plugins/hls-tactics-plugin/new/src/Wingman/Metaprogramming/Parser/Documentation.hs +++ b/plugins/hls-tactics-plugin/new/src/Wingman/Metaprogramming/Parser/Documentation.hs @@ -7,8 +7,8 @@ import Data.Functor ((<&>)) import Data.List (sortOn) import Data.String (IsString) import Data.Text (Text) -import Data.Text.Prettyprint.Doc hiding (parens) -import Data.Text.Prettyprint.Doc.Render.String (renderString) +import Prettyprinter hiding (parens) +import Prettyprinter.Render.String (renderString) import Development.IDE.GHC.Compat (OccName) import qualified Text.Megaparsec as P import Wingman.Metaprogramming.Lexer (Parser, identifier, variable, parens) diff --git a/plugins/hls-tactics-plugin/new/src/Wingman/Metaprogramming/ProofState.hs b/plugins/hls-tactics-plugin/new/src/Wingman/Metaprogramming/ProofState.hs index 02e203a1d3..8c128a9153 100644 --- a/plugins/hls-tactics-plugin/new/src/Wingman/Metaprogramming/ProofState.hs +++ b/plugins/hls-tactics-plugin/new/src/Wingman/Metaprogramming/ProofState.hs @@ -8,8 +8,8 @@ module Wingman.Metaprogramming.ProofState where import Data.Bool (bool) import Data.Functor ((<&>)) import qualified Data.Text as T -import Data.Text.Prettyprint.Doc -import Data.Text.Prettyprint.Doc.Render.Util.Panic +import Prettyprinter +import Prettyprinter.Render.Util.Panic import Language.LSP.Types (sectionSeparator) import Wingman.Judgements (jHypothesis) import Wingman.Types diff --git a/plugins/hls-tactics-plugin/old/src/Wingman/Metaprogramming/Parser/Documentation.hs b/plugins/hls-tactics-plugin/old/src/Wingman/Metaprogramming/Parser/Documentation.hs index 44071a5ae7..0c37d6365a 100644 --- a/plugins/hls-tactics-plugin/old/src/Wingman/Metaprogramming/Parser/Documentation.hs +++ b/plugins/hls-tactics-plugin/old/src/Wingman/Metaprogramming/Parser/Documentation.hs @@ -7,8 +7,8 @@ import Data.Functor ((<&>)) import Data.List (sortOn) import Data.String (IsString) import Data.Text (Text) -import Data.Text.Prettyprint.Doc hiding (parens) -import Data.Text.Prettyprint.Doc.Render.String (renderString) +import Prettyprinter hiding (parens) +import Prettyprinter.Render.String (renderString) import Development.IDE.GHC.Compat (OccName) import qualified Text.Megaparsec as P import Wingman.Metaprogramming.Lexer (Parser, identifier, variable, parens) diff --git a/plugins/hls-tactics-plugin/old/src/Wingman/Metaprogramming/ProofState.hs b/plugins/hls-tactics-plugin/old/src/Wingman/Metaprogramming/ProofState.hs index 02e203a1d3..8c128a9153 100644 --- a/plugins/hls-tactics-plugin/old/src/Wingman/Metaprogramming/ProofState.hs +++ b/plugins/hls-tactics-plugin/old/src/Wingman/Metaprogramming/ProofState.hs @@ -8,8 +8,8 @@ module Wingman.Metaprogramming.ProofState where import Data.Bool (bool) import Data.Functor ((<&>)) import qualified Data.Text as T -import Data.Text.Prettyprint.Doc -import Data.Text.Prettyprint.Doc.Render.Util.Panic +import Prettyprinter +import Prettyprinter.Render.Util.Panic import Language.LSP.Types (sectionSeparator) import Wingman.Judgements (jHypothesis) import Wingman.Types