haskell · mergify · Jan 20, 2022 · Jan 17, 2022 · Jan 16, 2022 · Jan 17, 2022
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -105,6 +105,11 @@ jobs:
       - STACK_FILE: "stack-9.0.2.yaml"
     <<: *defaults
 
+  ghc-9.2.1:
+    environment:
+      - STACK_FILE: "stack-9.2.1.yaml"
+    <<: *defaults
+
   ghc-default:
     environment:
       - STACK_FILE: "stack.yaml"
@@ -121,4 +126,5 @@ workflows:
       - ghc-8.10.7
       - ghc-9.0.1
       - ghc-9.0.2
+      - ghc-9.2.1
       - ghc-default
@@ -57,17 +57,11 @@ jobs:
           os:  ${{ runner.os }}
 
       - name: Build `hls-graph` with flags
-        run: cabal v2-build hls-graph --flags="pedantic embed-files stm-stats"
+        run: cabal v2-build hls-graph --flags="embed-files stm-stats"
 
       - name: Build `hie-compat` with flags
         run: cabal v2-build hie-compat --flags="ghc-lib"
 
-      - name: Build `hls-plugin-api` with flags
-        run: cabal v2-build hls-plugin-api --flags="pedantic"
-
-      - name: Build `hls-test-utils` with flags
-        run: cabal v2-build hls-test-utils --flags="pedantic"
-
       - name: Build
         run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe"
 

@@ -27,16 +27,6 @@ packages:
          ./plugins/hls-call-hierarchy-plugin
          ./plugins/hls-alternate-number-format-plugin
 
-repository head.hackage.ghc.haskell.org
-   url: https://ghc.gitlab.haskell.org/head.hackage/
-   secure: True
-   key-threshold: 3
-   root-keys:
-       f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
-       26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
-       7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
-
-
 with-compiler: ghc-9.2.1
 
 tests: true
@@ -63,17 +53,8 @@ constraints:
     -splice
     -stylishhaskell
     -tactic,
-  ghc-lib-parser ^>= 9.2,
-  attoparsec ^>= 0.14.3,
-  ghc-exactprint >= 1.3,
-  retrie >= 1.2,
-  direct-sqlite == 2.3.26,
-  lens >= 5.0.1,
-  primitive-unlifted ==0.1.3.1
 
 allow-newer:
-  -- base,
-
   -- for shake-bench
   Chart:lens,
   Chart-diagrams:lens,

diff --git a/cabal.project b/cabal.project
@@ -34,6 +34,8 @@ optional-packages: vendored/*/*.cabal
 
 tests: true
 
+flags: +pedantic
+
 package *
   ghc-options: -haddock
   test-show-details: direct

diff --git a/configuration-ghc-901.nix b/configuration-ghc-901.nix
@@ -3,7 +3,6 @@
 
 let
   disabledPlugins = [
-    "hls-brittany-plugin"
     "hls-stylish-haskell-plugin"
   ];
 
@@ -17,7 +16,6 @@ let
       haskell-language-server =
         hself.callCabal2nixWithOptions "haskell-language-server" ./.
         (pkgs.lib.concatStringsSep " " [
-          "-f-brittany"
           "-f-stylishhaskell"
         ]) { };
 

@@ -14,16 +14,13 @@ module Development.IDE.Graph.Internal.Types where
 
 import           Control.Applicative
 import           Control.Monad.Catch
-#if __GLASGOW_HASKELL__ < 870
+#if __GLASGOW_HASKELL__ < 808
 -- Needed in GHC 8.6.5
 import           Control.Concurrent.STM.Stats  (TVar, atomically)
+import           Control.Monad.Fail
 #else
 import           GHC.Conc                      (TVar, atomically)
 #endif
-#if __GLASGOW_HASKELL__ < 880
-import           Control.Monad.Fail
-import           Prelude                       hiding (MonadFail)
-#endif
 import           Control.Monad.IO.Class
 import           Control.Monad.Trans.Reader
 import           Data.Aeson                    (FromJSON, ToJSON)

diff --git a/plugins/default/src/Ide/Plugin/Example.hs b/plugins/default/src/Ide/Plugin/Example.hs
@@ -109,15 +109,18 @@ mkDiag file diagSource sev loc msg = (file, D.ShowDiag,)
 -- | Generate code actions.
 codeAction :: PluginMethodHandler IdeState TextDocumentCodeAction
 codeAction state _pid (CodeActionParams _ _ (TextDocumentIdentifier uri) _range CodeActionContext{_diagnostics=List _xs}) = liftIO $ do
-    let Just nfp = uriToNormalizedFilePath $ toNormalizedUri uri
-    Just (ParsedModule{},_) <- runIdeAction "example" (shakeExtras state) $ useWithStaleFast GetParsedModule nfp
-    let
-      title = "Add TODO Item 1"
-      tedit = [TextEdit (Range (Position 2 0) (Position 2 0))
-               "-- TODO1 added by Example Plugin directly\n"]
-      edit  = WorkspaceEdit (Just $ Map.singleton uri $ List tedit) Nothing Nothing
-    pure $ Right $ List
-        [ InR $ CodeAction title (Just CodeActionQuickFix) (Just $ List []) Nothing Nothing (Just edit) Nothing Nothing]
+    let mbnfp = uriToNormalizedFilePath $ toNormalizedUri uri
+    case mbnfp of
+      Just nfp -> do
+        Just (ParsedModule{},_) <- runIdeAction "example" (shakeExtras state) $ useWithStaleFast GetParsedModule nfp
+        let
+          title = "Add TODO Item 1"
+          tedit = [TextEdit (Range (Position 2 0) (Position 2 0))
+                  "-- TODO1 added by Example Plugin directly\n"]
+          edit  = WorkspaceEdit (Just $ Map.singleton uri $ List tedit) Nothing Nothing
+        pure $ Right $ List
+            [ InR $ CodeAction title (Just CodeActionQuickFix) (Just $ List []) Nothing Nothing (Just edit) Nothing Nothing]
+      Nothing -> error $ "Unable to get a normalized file path from the uri: " ++ show uri
 
 -- ---------------------------------------------------------------------
 

diff --git a/plugins/hls-eval-plugin/src/Ide/Plugin/Eval/Rules.hs b/plugins/hls-eval-plugin/src/Ide/Plugin/Eval/Rules.hs
@@ -2,7 +2,8 @@
 {-# LANGUAGE LambdaCase      #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RecordWildCards #-}
-
+-- To avoid warning "Pattern match has inaccessible right hand side"
+{-# OPTIONS_GHC -fno-warn-overlapping-patterns #-}
 module Ide.Plugin.Eval.Rules (GetEvalComments(..), rules,queueForEvaluation) where
 
 import           Control.Monad.IO.Class               (MonadIO (liftIO))

@@ -59,7 +59,9 @@ import           Development.IDE.GHC.Compat                         (BufSpan,
                                                                      DynFlags,
                                                                      extensionFlags,
                                                                      ms_hspp_opts,
-                                                                     topDir)
+                                                                     topDir,
+                                                                     WarningFlag(Opt_WarnUnrecognisedPragmas),
+                                                                     wopt)
 import qualified Development.IDE.GHC.Compat.Util                    as EnumSet
 import           "ghc-lib" GHC                                      hiding
                                                                     (DynFlags (..),
@@ -85,6 +87,7 @@ import           Language.Haskell.GHC.ExactPrint.Delta              (deltaOption
 import           Language.Haskell.GHC.ExactPrint.Parsers            (postParseTransform)
 import           Language.Haskell.GHC.ExactPrint.Types              (Rigidity (..))
 import           Language.Haskell.GhclibParserEx.Fixity             as GhclibParserEx (applyFixities)
+import           GHC.Generics                                       (Associativity (LeftAssociative, NotAssociative, RightAssociative))
 #endif
 
 import           Ide.Logger
@@ -105,21 +108,17 @@ import           Language.LSP.Types                                 hiding
 import qualified Language.LSP.Types                                 as LSP
 import qualified Language.LSP.Types.Lens                            as LSP
 
-import           GHC.Generics                                       (Associativity (LeftAssociative, NotAssociative, RightAssociative),
-                                                                     Generic)
-import           Text.Regex.TDFA.Text                               ()
-
-import           Development.IDE.GHC.Compat                         (WarningFlag (Opt_WarnUnrecognisedPragmas),
-                                                                     wopt)
 import           Development.IDE.Spans.Pragmas                      (LineSplitTextEdits (LineSplitTextEdits),
                                                                      NextPragmaInfo (NextPragmaInfo),
                                                                      getNextPragmaInfo,
                                                                      lineSplitDeleteTextEdit,
                                                                      lineSplitInsertTextEdit,
                                                                      lineSplitTextEdits,
                                                                      nextPragmaLine)
+import           GHC.Generics                                       (Generic)
 import           System.Environment                                 (setEnv,
                                                                      unsetEnv)
+import           Text.Regex.TDFA.Text                               ()
 -- ---------------------------------------------------------------------
 
 #ifdef HLINT_ON_GHC_LIB

diff --git a/plugins/hls-tactics-plugin/src/Wingman/LanguageServer/TacticProviders.hs b/plugins/hls-tactics-plugin/src/Wingman/LanguageServer/TacticProviders.hs
@@ -160,10 +160,11 @@ commandProvider RunMetaprogram =
 
 
 requireGHC88OrHigher :: TacticProvider -> TacticProvider
-requireGHC88OrHigher tp tpd =
 #if __GLASGOW_HASKELL__ >= 808
+requireGHC88OrHigher tp tpd =
   tp tpd
 #else
+requireGHC88OrHigher _ _=
   mempty
 #endif
 

diff --git a/plugins/hls-tactics-plugin/src/Wingman/Metaprogramming/Parser/Documentation.hs b/plugins/hls-tactics-plugin/src/Wingman/Metaprogramming/Parser/Documentation.hs
@@ -6,8 +6,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/src/Wingman/Metaprogramming/ProofState.hs b/plugins/hls-tactics-plugin/src/Wingman/Metaprogramming/ProofState.hs
@@ -6,8 +6,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/src/Wingman/StaticPlugin.hs b/plugins/hls-tactics-plugin/src/Wingman/StaticPlugin.hs
@@ -8,17 +8,21 @@ module Wingman.StaticPlugin
   , pattern MetaprogramSyntax
   ) where
 
-import Data.Data
 import Development.IDE.GHC.Compat
 import Development.IDE.GHC.Compat.Util
 import GHC.LanguageExtensions.Type (Extension(EmptyCase, QuasiQuotes))
-import Generics.SYB
+
 import Ide.Types
+
+#if __GLASGOW_HASKELL__ >= 808
+import Data.Data
+import Generics.SYB
 #if __GLASGOW_HASKELL__ >= 900
 import GHC.Driver.Plugins (purePlugin)
 #else
 import Plugins (purePlugin)
 #endif
+#endif
 
 staticPlugin :: DynFlagsModifications
 staticPlugin = mempty
@@ -44,7 +48,6 @@ pattern MetaprogramSourceText :: SourceText
 pattern MetaprogramSourceText = SourceText "wingman-meta-program"
 
 
-
 pattern WingmanMetaprogram :: FastString -> HsExpr p
 pattern WingmanMetaprogram mp <-
 #if __GLASGOW_HASKELL__ >= 900
@@ -56,7 +59,6 @@ pattern WingmanMetaprogram mp <-
 #endif
 
 
-
 enableQuasiQuotes :: DynFlags -> DynFlags
 enableQuasiQuotes = flip xopt_set QuasiQuotes
 
@@ -80,11 +82,6 @@ metaprogrammingPlugin =
         }
     worker :: Monad m => [CommandLineOption] -> ModSummary -> HsParsedModule -> m HsParsedModule
     worker _ _ pm = pure $ pm { hpm_module = addMetaprogrammingSyntax $ hpm_module pm }
-#endif
-
-metaprogramHoleName :: OccName
-metaprogramHoleName = mkVarOcc "_$metaprogram"
-
 
 mkMetaprogram :: SrcSpan -> FastString -> HsExpr GhcPs
 mkMetaprogram ss mp =
@@ -98,14 +95,16 @@ mkMetaprogram ss mp =
     $ L ss
     $ mkRdrUnqual metaprogramHoleName
 
-
 addMetaprogrammingSyntax :: Data a => a -> a
 addMetaprogrammingSyntax =
   everywhere $ mkT $ \case
     L ss (MetaprogramSyntax mp) ->
       L ss $ mkMetaprogram ss mp
     (x :: LHsExpr GhcPs) -> x
+#endif
 
+metaprogramHoleName :: OccName
+metaprogramHoleName = mkVarOcc "_$metaprogram"
 
 pattern MetaprogramSyntax :: FastString -> HsExpr GhcPs
 pattern MetaprogramSyntax mp <-
@@ -119,4 +118,3 @@ pattern MetaprogramSyntax mp <-
           (mkRdrUnqual $ mkVarOcc "wingman")
           noSrcSpan
           mp
-
diff --git a/plugins/hls-tactics-plugin/src/Wingman/Types.hs b/plugins/hls-tactics-plugin/src/Wingman/Types.hs
@@ -38,7 +38,6 @@ import           GHC.Exts (fromString)
 import           GHC.Generics
 import           GHC.SourceGen (var)
 import           Refinery.ProofState
-import           Refinery.Tactic
 import           Refinery.Tactic.Internal (TacticT(TacticT), RuleT (RuleT))
 import           System.IO.Unsafe (unsafePerformIO)
 import           Wingman.Debug

diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
@@ -78,6 +78,7 @@ extra-deps:
   - optparse-applicative-0.15.1.0
   - ormolu-0.1.4.1
   - parser-combinators-1.2.1
+  - prettyprinter-1.7.0
   - primitive-0.7.1.0
   - refinery-0.4.0.0
   - regex-base-0.94.0.0

diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
@@ -63,6 +63,7 @@ extra-deps:
   - monad-dijkstra-0.1.1.2
   - opentelemetry-0.6.1
   - opentelemetry-extra-0.6.1
+  - prettyprinter-1.7.0
   - refinery-0.4.0.0
   - retrie-1.1.0.0
   - semigroups-0.18.5

diff --git a/stack-9.0.2.yaml b/stack-9.0.2.yaml
@@ -20,7 +20,7 @@ packages:
 - ./plugins/hls-retrie-plugin
 - ./plugins/hls-splice-plugin
 # - ./plugins/hls-tactics-plugin
-# - ./plugins/hls-brittany-plugin
+- ./plugins/hls-brittany-plugin
 # - ./plugins/hls-stylish-haskell-plugin
 - ./plugins/hls-floskell-plugin
 - ./plugins/hls-fourmolu-plugin
@@ -101,7 +101,6 @@ flags:
     ignore-plugins-ghc-bounds: true
     tactic: false # Dependencies fail
     stylishHaskell: false
-    brittany: false
 
   retrie:
     BuildExecutable: false