From 8ae051920af19d1221710aaec01a7635fee61741 Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Sun, 8 Aug 2021 01:47:17 +0800 Subject: [PATCH] Allow ormolu 0.2 and fix compatibility with GHC 9 Ormolu 0.2 fixes compatibility with GHC 9. Turns out adding `ghc-api-compat` here is enough for GHC 9 compatibility. Builds fine and all tests pass. --- plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal index 93c27a7040..496493203c 100644 --- a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal +++ b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal @@ -23,12 +23,13 @@ library , base >=4.12 && <5 , filepath , ghc + , ghc-api-compat , ghc-boot-th , ghcide >=1.2 && <1.5 , hls-plugin-api >=1.1 && <1.3 , lens , lsp - , ormolu ^>=0.1.2 + , ormolu ^>=0.1.2 || ^>= 0.2 , text default-language: Haskell2010