From 8d32f2e54b9737306fc3d03c8a9aaf9a76cc5c02 Mon Sep 17 00:00:00 2001 From: hololeap Date: Fri, 19 Nov 2021 04:16:52 -0700 Subject: [PATCH 1/9] hls-class-plugin: Update ghcide dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `hls-class-plugin-1.0.1.1` imports `Development.IDE.GHC.Compat.Util`, which doesn't exist until version `1.5.0` ``` Building library for hls-class-plugin-1.0.1.1.. [1 of 1] Compiling Ide.Plugin.Class ( src/Ide/Plugin/Class.hs, dist/build/Ide/Plugin/Class.o, dist/build/Ide/Plugin/Class.dyn_o ) src/Ide/Plugin/Class.hs:27:1: error: Could not find module ‘Development.IDE.GHC.Compat.Util’ Perhaps you meant Development.IDE.GHC.Compat (from ghcide-1.4.2.2) Development.IDE.GHC.Util (from ghcide-1.4.2.2) Use -v (or `:set -v` in ghci) to see a list of the files searched for. | 27 | import Development.IDE.GHC.Compat.Util | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``` --- plugins/hls-class-plugin/hls-class-plugin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hls-class-plugin/hls-class-plugin.cabal b/plugins/hls-class-plugin/hls-class-plugin.cabal index d7342d72c0..4cc10522ff 100644 --- a/plugins/hls-class-plugin/hls-class-plugin.cabal +++ b/plugins/hls-class-plugin/hls-class-plugin.cabal @@ -29,7 +29,7 @@ library , containers , ghc , ghc-exactprint - , ghcide >=1.2 && <1.6 + , ghcide ^>=1.5.0 , hls-plugin-api >=1.1 && <1.3 , lens , lsp From 068fea9393429ce0887bedd61fb44e1e0af00fa8 Mon Sep 17 00:00:00 2001 From: hololeap Date: Fri, 19 Nov 2021 10:09:35 -0700 Subject: [PATCH 2/9] hls-fourmolu-plugin: Update ghcide dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` src/Ide/Plugin/Fourmolu.hs:18:1: error: Could not find module ‘Development.IDE.GHC.Compat.Util’ Perhaps you meant Development.IDE.GHC.Compat (from ghcide-1.4.2.2) Development.IDE.GHC.Util (from ghcide-1.4.2.2) Use -v (or `:set -v` in ghci) to see a list of the files searched for. | 18 | import qualified Development.IDE.GHC.Compat.Util as S | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``` --- plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal index 240935ec66..843aee58e4 100644 --- a/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal +++ b/plugins/hls-fourmolu-plugin/hls-fourmolu-plugin.cabal @@ -26,7 +26,7 @@ library , fourmolu ^>=0.3 || ^>=0.4 , ghc , ghc-boot-th - , ghcide >=1.2 && <1.6 + , ghcide ^>=1.5.0 , hls-plugin-api >=1.1 && <1.3 , lens , lsp From 4d7655a8714a77a1fbb3754129bcd2e992aa3000 Mon Sep 17 00:00:00 2001 From: hololeap Date: Fri, 19 Nov 2021 20:33:00 -0700 Subject: [PATCH 3/9] hls-hlint-plugin: Update ghcide dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` src/Ide/Plugin/Hlint.hs:79:1: error: Could not find module ‘Development.IDE.GHC.Compat.Core’ Perhaps you meant Development.IDE.GHC.Compat (from ghcide-1.4.2.2) Use -v (or `:set -v` in ghci) to see a list of the files searched for. | 79 | import Development.IDE.GHC.Compat.Core hiding | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... ``` --- plugins/hls-hlint-plugin/hls-hlint-plugin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal index afe9c07c81..61836daab5 100644 --- a/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal +++ b/plugins/hls-hlint-plugin/hls-hlint-plugin.cabal @@ -55,7 +55,7 @@ library , extra , filepath , ghc-exactprint >=0.6.3.4 - , ghcide ^>=1.4 || ^>=1.5 + , ghcide ^>=1.5.0 , hashable , hlint , hls-plugin-api >=1.1 && <1.3 From 92e3f14f5452e4a3bf6e98b258a83bca7f3861e0 Mon Sep 17 00:00:00 2001 From: hololeap Date: Fri, 19 Nov 2021 21:08:34 -0700 Subject: [PATCH 4/9] hls-ormolu-plugin: Update ghcide dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` src/Ide/Plugin/Ormolu.hs:14:69: error: Module ‘Development.IDE.GHC.Compat’ does not export ‘hsc_dflags’ | 14 | import Development.IDE.GHC.Compat (moduleNameString, hsc_dflags) | ^^^^^^^^^^ src/Ide/Plugin/Ormolu.hs:16:1: error: Could not find module ‘Development.IDE.GHC.Compat.Util’ Perhaps you meant Development.IDE.GHC.Compat (from ghcide-1.4.2.2) Development.IDE.GHC.Util (from ghcide-1.4.2.2) Use -v (or `:set -v` in ghci) to see a list of the files searched for. | 16 | import qualified Development.IDE.GHC.Compat.Util as S | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``` --- plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal index bc416d5303..8ab491f626 100644 --- a/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal +++ b/plugins/hls-ormolu-plugin/hls-ormolu-plugin.cabal @@ -24,7 +24,7 @@ library , filepath , ghc , ghc-boot-th - , ghcide >=1.2 && <1.6 + , ghcide ^>=1.5.0 , hls-plugin-api >=1.1 && <1.3 , lens , lsp From 1205d6eec4e3df325a92a87b51f53654e4684eab Mon Sep 17 00:00:00 2001 From: hololeap Date: Sun, 21 Nov 2021 12:25:34 -0700 Subject: [PATCH 5/9] hls-retrie-plugin: Update ghcide dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` src/Ide/Plugin/Retrie.hs:60:56: error: Module ‘Development.IDE.GHC.Compat’ does not export ‘Outputable’ | 60 | Outputable, | ^^^^^^^^^^ src/Ide/Plugin/Retrie.hs:64:56: error: Module ‘Development.IDE.GHC.Compat’ does not export ‘SourceText(..)’ | 64 | SourceText (..), | ^^^^^^^^^^^^^^^ src/Ide/Plugin/Retrie.hs:68:56: error: Module ‘Development.IDE.GHC.Compat’ does not export ‘hm_iface’ | 68 | hm_iface, isQual, | ^^^^^^^^ src/Ide/Plugin/Retrie.hs:68:66: error: Module ‘Development.IDE.GHC.Compat’ does not export ‘isQual’ | 68 | hm_iface, isQual, | ^^^^^^ src/Ide/Plugin/Retrie.hs:69:56: error: Module ‘Development.IDE.GHC.Compat’ does not export ‘isQual_maybe’ | 69 | isQual_maybe, | ^^^^^^^^^^^^ src/Ide/Plugin/Retrie.hs:72:56: error: Module ‘Development.IDE.GHC.Compat’ does not export ‘nameModule_maybe’ | 72 | nameModule_maybe, | ^^^^^^^^^^^^^^^^ src/Ide/Plugin/Retrie.hs:73:56: error: Module ‘Development.IDE.GHC.Compat’ does not export ‘nameRdrName’ | 73 | nameRdrName, occNameFS, | ^^^^^^^^^^^ src/Ide/Plugin/Retrie.hs:73:69: error: Module ‘Development.IDE.GHC.Compat’ does not export ‘occNameFS’ | 73 | nameRdrName, occNameFS, | ^^^^^^^^^ src/Ide/Plugin/Retrie.hs:74:56: error: Module ‘Development.IDE.GHC.Compat’ does not export ‘occNameString’ | 74 | occNameString, | ^^^^^^^^^^^^^ src/Ide/Plugin/Retrie.hs:79:56: error: Module ‘Development.IDE.GHC.Compat’ does not export ‘rdrNameOcc’ | 79 | rdrNameOcc, rds_rules, | ^^^^^^^^^^ src/Ide/Plugin/Retrie.hs:81:1: error: Could not find module ‘Development.IDE.GHC.Compat.Util’ Perhaps you meant Development.IDE.GHC.Compat (from ghcide-1.4.2.2) Development.IDE.GHC.Util (from ghcide-1.4.2.2) Use -v (or `:set -v` in ghci) to see a list of the files searched for. | 81 | import Development.IDE.GHC.Compat.Util hiding (catch, try) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``` --- plugins/hls-retrie-plugin/hls-retrie-plugin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal index 08662ede87..99c8a3d6df 100644 --- a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal +++ b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal @@ -23,7 +23,7 @@ library , directory , extra , ghc - , ghcide >=1.2 && <1.6 + , ghcide ^>=1.5.0 , hashable , hls-plugin-api >=1.1 && <1.3 , lsp From 72a1ea0d0ba1740e405addf3430b90116daecfb2 Mon Sep 17 00:00:00 2001 From: hololeap Date: Sun, 21 Nov 2021 12:34:43 -0700 Subject: [PATCH 6/9] hls-retrie-plugin: Update ghcide dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` src/Ide/Plugin/Splice.hs:48:1: error: Could not find module ‘Development.IDE.GHC.Compat.Util’ Perhaps you meant Development.IDE.GHC.Compat (from ghcide-1.4.2.2) Development.IDE.GHC.Util (from ghcide-1.4.2.2) Use -v (or `:set -v` in ghci) to see a list of the files searched for. | 48 | import qualified Development.IDE.GHC.Compat.Util as Util | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``` --- plugins/hls-splice-plugin/hls-splice-plugin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hls-splice-plugin/hls-splice-plugin.cabal b/plugins/hls-splice-plugin/hls-splice-plugin.cabal index d7c4e99cf4..3d945ba9e6 100644 --- a/plugins/hls-splice-plugin/hls-splice-plugin.cabal +++ b/plugins/hls-splice-plugin/hls-splice-plugin.cabal @@ -38,7 +38,7 @@ library , foldl , ghc , ghc-exactprint - , ghcide >=1.2 && <1.6 + , ghcide ^>=1.5.0 , hls-plugin-api >=1.1 && <1.3 , lens , lsp From a61eacbbfc67172f3488ca11c9be57f3da114a77 Mon Sep 17 00:00:00 2001 From: hololeap Date: Sun, 21 Nov 2021 12:47:01 -0700 Subject: [PATCH 7/9] hls-stylish-haskell-plugin: Update ghcide dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` src/Ide/Plugin/StylishHaskell.hs:13:1: error: Could not find module ‘Development.IDE.GHC.Compat.Util’ Perhaps you meant Development.IDE.GHC.Compat (from ghcide-1.4.2.2) Development.IDE.GHC.Util (from ghcide-1.4.2.2) Use -v (or `:set -v` in ghci) to see a list of the files searched for. | 13 | import qualified Development.IDE.GHC.Compat.Util as Util | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``` --- .../hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal index d9eae4b04b..3bfc719cc6 100644 --- a/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal +++ b/plugins/hls-stylish-haskell-plugin/hls-stylish-haskell-plugin.cabal @@ -24,7 +24,7 @@ library , filepath , ghc , ghc-boot-th - , ghcide >=1.2 && <1.6 + , ghcide ^>=1.5.0 , hls-plugin-api >=1.1 && <1.3 , lsp-types , stylish-haskell ^>=0.12 || ^>=0.13 From 0e65abadd63704700c64f77a1ea50442bb922aef Mon Sep 17 00:00:00 2001 From: hololeap Date: Sun, 21 Nov 2021 12:51:53 -0700 Subject: [PATCH 8/9] hls-tactics-plugin: Update ghcide dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` src/Wingman/Metaprogramming/Lexer.hs:14:1: error: Could not find module ‘Development.IDE.GHC.Compat.Core’ Perhaps you meant Development.IDE.GHC.Compat (from ghcide-1.4.2.2) Use -v (or `:set -v` in ghci) to see a list of the files searched for. | 14 | import Development.IDE.GHC.Compat.Core (OccName, mkVarOcc) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ src/Wingman/Range.hs:7:1: error: Could not find module ‘Development.IDE.GHC.Compat.Core’ Perhaps you meant Development.IDE.GHC.Compat (from ghcide-1.4.2.2) Use -v (or `:set -v` in ghci) to see a list of the files searched for. | 7 | import Development.IDE.GHC.Compat.Core | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ src/Wingman/Range.hs:8:1: error: Could not find module ‘Development.IDE.GHC.Compat.Util’ Perhaps you meant Development.IDE.GHC.Compat (from ghcide-1.4.2.2) Development.IDE.GHC.Util (from ghcide-1.4.2.2) Use -v (or `:set -v` in ghci) to see a list of the files searched for. | 8 | import Development.IDE.GHC.Compat.Util as FS | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ src/Wingman/StaticPlugin.hs:12:1: error: Could not find module ‘Development.IDE.GHC.Compat.Util’ Perhaps you meant Development.IDE.GHC.Compat (from ghcide-1.4.2.2) Development.IDE.GHC.Util (from ghcide-1.4.2.2) Use -v (or `:set -v` in ghci) to see a list of the files searched for. | 12 | import Development.IDE.GHC.Compat.Util | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``` --- plugins/hls-tactics-plugin/hls-tactics-plugin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal index 14f748a93d..e2cbea5944 100644 --- a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal +++ b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal @@ -82,7 +82,7 @@ library , ghc-boot-th , ghc-exactprint , ghc-source-gen ^>=0.4.1 - , ghcide ^>=1.4.1 || ^>=1.5 + , ghcide ^>=1.5.0 , hls-graph , hls-plugin-api >=1.1 && <1.3 , hyphenation From 874568d04f0b2b7384e0528cbc660089e1756aa5 Mon Sep 17 00:00:00 2001 From: hololeap Date: Sun, 21 Nov 2021 20:53:39 -0700 Subject: [PATCH 9/9] hls-test-utils: Update ghcide dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` src/Test/Hls.hs:52:51: error: Module ‘Development.IDE.Plugin.Test’ does not export ‘TestRequest(GetBuildKeysBuilt)’ | 52 | import Development.IDE.Plugin.Test (TestRequest (GetBuildKeysBuilt, WaitForIdeRule, WaitForShakeQueue), | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ src/Test/Hls.hs:57:51: error: Module ‘Ide.PluginUtils’ does not export ‘idePluginsToPluginDesc’ | 57 | import Ide.PluginUtils (idePluginsToPluginDesc, | ^^^^^^^^^^^^^^^^^^^^^^ ``` --- hls-test-utils/hls-test-utils.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hls-test-utils/hls-test-utils.cabal b/hls-test-utils/hls-test-utils.cabal index 32c3f2e805..1ec859f732 100644 --- a/hls-test-utils/hls-test-utils.cabal +++ b/hls-test-utils/hls-test-utils.cabal @@ -41,7 +41,7 @@ library , directory , extra , filepath - , ghcide ^>=1.4 || ^>=1.5 + , ghcide ^>=1.5.0 , hls-graph , hls-plugin-api ^>=1.2 , hspec <2.8