Skip to content

Commit to prettyprinter >= 1.7 #3649

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jun 12, 2023
Merged

Commit to prettyprinter >= 1.7 #3649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33919a0
Commit to prettyprinter >= 1.7
michaelpj Jun 12, 2023
4201ed0
Merge branch 'master' into mpj/prettyprinter
mergify[bot] Jun 12, 2023
1341f2e
Merge branch 'master' into mpj/prettyprinter
mergify[bot] Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions ghcide/src/Development/IDE/Types/Diagnostics.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
85 changes: 36 additions & 49 deletions ghcide/src/Development/IDE/Types/Logger.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ common common-deps
, extra
, filepath
, text
, prettyprinter
, prettyprinter >= 1.7

-- Default warnings in HLS
common warnings
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-tactics-plugin/new/src/Wingman/Metaprogramming/Parser/Documentation.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-tactics-plugin/new/src/Wingman/Metaprogramming/ProofState.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-tactics-plugin/old/src/Wingman/Metaprogramming/Parser/Documentation.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions plugins/hls-tactics-plugin/old/src/Wingman/Metaprogramming/ProofState.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down