Skip to content
Snippets Groups Projects
Unverified Commit 1eb133f0 authored by fendor's avatar fendor Committed by GitHub
Browse files

Update to latest prettyprinter API (#2352)

* Update to latest prettyprinter API

* Update stack files to use prettyprinter 1.7.1
parent ab46fe8d
No related branches found
No related tags found
No related merge requests found
...@@ -71,7 +71,7 @@ library ...@@ -71,7 +71,7 @@ library
optparse-applicative, optparse-applicative,
parallel, parallel,
prettyprinter-ansi-terminal, prettyprinter-ansi-terminal,
prettyprinter, prettyprinter >= 1.7,
regex-tdfa >= 1.3.1.0, regex-tdfa >= 1.3.1.0,
retrie, retrie,
rope-utf16-splay, rope-utf16-splay,
......
...@@ -19,10 +19,10 @@ module Development.IDE.Types.Diagnostics ( ...@@ -19,10 +19,10 @@ module Development.IDE.Types.Diagnostics (
import Control.DeepSeq import Control.DeepSeq
import Data.Maybe as Maybe import Data.Maybe as Maybe
import qualified Data.Text as T import qualified Data.Text as T
import Data.Text.Prettyprint.Doc import Prettyprinter
import Data.Text.Prettyprint.Doc.Render.Terminal (Color (..), color) import Prettyprinter.Render.Terminal (Color (..), color)
import qualified Data.Text.Prettyprint.Doc.Render.Terminal as Terminal import qualified Prettyprinter.Render.Terminal as Terminal
import Data.Text.Prettyprint.Doc.Render.Text import Prettyprinter.Render.Text
import Language.LSP.Diagnostics import Language.LSP.Diagnostics
import Language.LSP.Types as LSP (Diagnostic (..), import Language.LSP.Types as LSP (Diagnostic (..),
DiagnosticSeverity (..), DiagnosticSeverity (..),
......
...@@ -6,8 +6,8 @@ import Data.Functor ((<&>)) ...@@ -6,8 +6,8 @@ import Data.Functor ((<&>))
import Data.List (sortOn) import Data.List (sortOn)
import Data.String (IsString) import Data.String (IsString)
import Data.Text (Text) import Data.Text (Text)
import Data.Text.Prettyprint.Doc hiding (parens) import Prettyprinter hiding (parens)
import Data.Text.Prettyprint.Doc.Render.String (renderString) import Prettyprinter.Render.String (renderString)
import Development.IDE.GHC.Compat (OccName) import Development.IDE.GHC.Compat (OccName)
import qualified Text.Megaparsec as P import qualified Text.Megaparsec as P
import Wingman.Metaprogramming.Lexer (Parser, identifier, variable, parens) import Wingman.Metaprogramming.Lexer (Parser, identifier, variable, parens)
......
...@@ -6,8 +6,8 @@ module Wingman.Metaprogramming.ProofState where ...@@ -6,8 +6,8 @@ module Wingman.Metaprogramming.ProofState where
import Data.Bool (bool) import Data.Bool (bool)
import Data.Functor ((<&>)) import Data.Functor ((<&>))
import qualified Data.Text as T import qualified Data.Text as T
import Data.Text.Prettyprint.Doc import Prettyprinter
import Data.Text.Prettyprint.Doc.Render.Util.Panic import Prettyprinter.Render.Util.Panic
import Language.LSP.Types (sectionSeparator) import Language.LSP.Types (sectionSeparator)
import Wingman.Judgements (jHypothesis) import Wingman.Judgements (jHypothesis)
import Wingman.Types import Wingman.Types
......
...@@ -64,6 +64,7 @@ extra-deps: ...@@ -64,6 +64,7 @@ extra-deps:
- constraints-extras-0.3.1.0 - constraints-extras-0.3.1.0
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055 - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082 - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- prettyprinter-1.7.1@sha256:9c43c9d8c3cd9f445596e5a2379574bba87f935a4d1fa41b5407ee3cf4edc743,6987
- lsp-1.2.0.1 - lsp-1.2.0.1
- lsp-types-1.3.0.1 - lsp-types-1.3.0.1
- lsp-test-0.14.0.1 - lsp-test-0.14.0.1
......
...@@ -46,6 +46,7 @@ extra-deps: ...@@ -46,6 +46,7 @@ extra-deps:
- refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663 - refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663
- retrie-1.0.0.0@sha256:82014773115807f649f60fe4a3246911bbccd063a3c846cf5665e71f237bdd2d,4241 - retrie-1.0.0.0@sha256:82014773115807f649f60fe4a3246911bbccd063a3c846cf5665e71f237bdd2d,4241
- stylish-haskell-0.12.2.0@sha256:38f7fd9ca30c9aad34f176dae4564576899e9c197b6b8557b59c5e8c6a622c74,6108 - stylish-haskell-0.12.2.0@sha256:38f7fd9ca30c9aad34f176dae4564576899e9c197b6b8557b59c5e8c6a622c74,6108
- prettyprinter-1.7.1@sha256:9c43c9d8c3cd9f445596e5a2379574bba87f935a4d1fa41b5407ee3cf4edc743,6987
# Enable these when supported by all formatters # Enable these when supported by all formatters
# - ghc-lib-9.0.1.20210324@sha256:c8b9a2541ea3424c8d0e4f80584477d0f35be03f4a47d931152042d5f446c5fc,19279 # - ghc-lib-9.0.1.20210324@sha256:c8b9a2541ea3424c8d0e4f80584477d0f35be03f4a47d931152042d5f446c5fc,19279
......
...@@ -46,6 +46,7 @@ extra-deps: ...@@ -46,6 +46,7 @@ extra-deps:
- refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663 - refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663
- retrie-1.0.0.0@sha256:82014773115807f649f60fe4a3246911bbccd063a3c846cf5665e71f237bdd2d,4241 - retrie-1.0.0.0@sha256:82014773115807f649f60fe4a3246911bbccd063a3c846cf5665e71f237bdd2d,4241
- stylish-haskell-0.12.2.0@sha256:38f7fd9ca30c9aad34f176dae4564576899e9c197b6b8557b59c5e8c6a622c74,6108 - stylish-haskell-0.12.2.0@sha256:38f7fd9ca30c9aad34f176dae4564576899e9c197b6b8557b59c5e8c6a622c74,6108
- prettyprinter-1.7.1@sha256:9c43c9d8c3cd9f445596e5a2379574bba87f935a4d1fa41b5407ee3cf4edc743,6987
# Enable these when supported by all formatters # Enable these when supported by all formatters
# - ghc-lib-9.0.1.20210324@sha256:c8b9a2541ea3424c8d0e4f80584477d0f35be03f4a47d931152042d5f446c5fc,19279 # - ghc-lib-9.0.1.20210324@sha256:c8b9a2541ea3424c8d0e4f80584477d0f35be03f4a47d931152042d5f446c5fc,19279
......
...@@ -100,6 +100,8 @@ extra-deps: ...@@ -100,6 +100,8 @@ extra-deps:
- constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853 - constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055 - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082 - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- prettyprinter-1.7.1@sha256:9c43c9d8c3cd9f445596e5a2379574bba87f935a4d1fa41b5407ee3cf4edc743,6987
- prettyprinter-ansi-terminal-1.1.3
- resourcet-1.2.3 - resourcet-1.2.3
- lsp-1.2.0.1 - lsp-1.2.0.1
- lsp-types-1.3.0.1 - lsp-types-1.3.0.1
......
...@@ -80,6 +80,7 @@ extra-deps: ...@@ -80,6 +80,7 @@ extra-deps:
- constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853 - constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055 - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082 - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- prettyprinter-1.7.1@sha256:9c43c9d8c3cd9f445596e5a2379574bba87f935a4d1fa41b5407ee3cf4edc743,6987
- lsp-1.2.0.1 - lsp-1.2.0.1
- lsp-types-1.3.0.1 - lsp-types-1.3.0.1
- lsp-test-0.14.0.1 - lsp-test-0.14.0.1
......
...@@ -77,6 +77,7 @@ extra-deps: ...@@ -77,6 +77,7 @@ extra-deps:
- constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853 - constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055 - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
- unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082 - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
- prettyprinter-1.7.1@sha256:9c43c9d8c3cd9f445596e5a2379574bba87f935a4d1fa41b5407ee3cf4edc743,6987
- lsp-1.2.0.1 - lsp-1.2.0.1
- lsp-types-1.3.0.1 - lsp-types-1.3.0.1
- lsp-test-0.14.0.1 - lsp-test-0.14.0.1
......
...@@ -79,6 +79,7 @@ extra-deps: ...@@ -79,6 +79,7 @@ extra-deps:
- Chart-1.9.3@sha256:640a38463318b070d80a049577e4f0b3322df98290abb7afcf0cb74a4ad5b512,2948 - Chart-1.9.3@sha256:640a38463318b070d80a049577e4f0b3322df98290abb7afcf0cb74a4ad5b512,2948
- Chart-diagrams-1.9.3@sha256:1535d5d0d3febca63138cecfde234315212611c21bb7f4358b2dae8c55c59003,1801 - Chart-diagrams-1.9.3@sha256:1535d5d0d3febca63138cecfde234315212611c21bb7f4358b2dae8c55c59003,1801
- statestack-0.3@sha256:be43ce2cd790a4732b88cdc9480458503cb5e307b4f79a502d99d5b3d417730e,1135 - statestack-0.3@sha256:be43ce2cd790a4732b88cdc9480458503cb5e307b4f79a502d99d5b3d417730e,1135
- prettyprinter-1.7.1@sha256:9c43c9d8c3cd9f445596e5a2379574bba87f935a4d1fa41b5407ee3cf4edc743,6987
- operational-0.2.4.0 - operational-0.2.4.0
- github: diagrams/active - github: diagrams/active
......
...@@ -46,6 +46,7 @@ extra-deps: ...@@ -46,6 +46,7 @@ extra-deps:
- refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663 - refinery-0.4.0.0@sha256:fe3a43add8ff1db5cfffee7e7694c86128b1dfe62c541f26e25a8eadf9585610,1663
- retrie-1.0.0.0@sha256:82014773115807f649f60fe4a3246911bbccd063a3c846cf5665e71f237bdd2d,4241 - retrie-1.0.0.0@sha256:82014773115807f649f60fe4a3246911bbccd063a3c846cf5665e71f237bdd2d,4241
- stylish-haskell-0.12.2.0@sha256:38f7fd9ca30c9aad34f176dae4564576899e9c197b6b8557b59c5e8c6a622c74,6108 - stylish-haskell-0.12.2.0@sha256:38f7fd9ca30c9aad34f176dae4564576899e9c197b6b8557b59c5e8c6a622c74,6108
- prettyprinter-1.7.1@sha256:9c43c9d8c3cd9f445596e5a2379574bba87f935a4d1fa41b5407ee3cf4edc743,6987
# Enable these when supported by all formatters # Enable these when supported by all formatters
# - ghc-lib-9.0.1.20210324@sha256:c8b9a2541ea3424c8d0e4f80584477d0f35be03f4a47d931152042d5f446c5fc,19279 # - ghc-lib-9.0.1.20210324@sha256:c8b9a2541ea3424c8d0e4f80584477d0f35be03f4a47d931152042d5f446c5fc,19279
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment