Merge branch 'master' into ghc92

Author: jneira

README.md

@@ -7,8 +7,8 @@
 [![Hackage][badge-hackage]][hackage]
 [![License Apache 2.0][badge-license]][license]
 [![CircleCI][badge-circleci]][circleci]
-![Github Testing Workflow](https://github.com/haskell/haskell-language-server/workflows/Testing/badge.svg)
-![Github Nix Workflow](https://github.com/haskell/haskell-language-server/workflows/Nix/badge.svg)
+[![GitHub Testing Workflow](https://github.com/haskell/haskell-language-server/actions/workflows/test.yml/badge.svg)](https://github.com/haskell/haskell-language-server/actions/workflows/test.yml)
+[![GitHub Nix Workflow](https://github.com/haskell/haskell-language-server/actions/workflows/nix.yml/badge.svg)](https://github.com/haskell/haskell-language-server/actions/workflows/nix.yml)
 [![codetriage][badge-codetriage]][codetriage]
 
 [logo]: ./docs/logos/logo-256.png

cabal-ghc901.project

@@ -10,10 +10,10 @@ packages:
         --  ./plugins/hls-brittany-plugin
         --  ./plugins/hls-stylish-haskell-plugin
         --  ./plugins/hls-fourmolu-plugin
-         ./plugins/hls-class-plugin
+        -- ./plugins/hls-class-plugin
          ./plugins/hls-eval-plugin
          ./plugins/hls-explicit-imports-plugin
-         ./plugins/hls-refine-imports-plugin
+        -- ./plugins/hls-refine-imports-plugin
          ./plugins/hls-hlint-plugin
          ./plugins/hls-rename-plugin
          ./plugins/hls-retrie-plugin
@@ -24,6 +24,9 @@ packages:
          ./plugins/hls-module-name-plugin
          ./plugins/hls-ormolu-plugin
          ./plugins/hls-call-hierarchy-plugin
+
+with-compiler: ghc-9.0.1
+
 tests: true
 
 package *
@@ -70,50 +73,9 @@ constraints:
     -- These plugins doesn't work on GHC9 yet
     haskell-language-server -brittany -class -fourmolu -stylishhaskell -tactic
 
-
 allow-newer:
-    -- -- Broken on ghc9, but let's pretend it's not so we can build the other things
-    -- brittany:base,
-    -- brittany:ghc,
-    -- brittany:ghc-boot-th,
-    -- butcher:base,
-    -- fourmolu:ghc-lib-parser,
-    -- stylish-haskell:ghc-lib-parser,
-    -- stylish-haskell:Cabal,
-    -- multistate:base,
-    -- ghc-source-gen:ghc,
-
-    assoc:base,
-    cryptohash-md5:base,
-    cryptohash-sha1:base,
-    constraints-extras:template-haskell,
-    data-tree-print:base,
-    deepseq:base,
-    dependent-sum:some,
-    dependent-sum:constraints,
-    diagrams-postscript:base,
-    diagrams-postscript:lens,
-    diagrams-postscript:diagrams-core,
-    diagrams-postscript:monoid-extras,
-    diagrams:diagrams-core,
-    Chart-diagrams:diagrams-core,
-    SVGFonts:diagrams-core,
-    dual-tree:base,
-    -- Does this make any sense?
-    entropy:Cabal,
-    force-layout:base,
-    force-layout:lens,
-    floskell:ghc-prim,
     floskell:base,
-    hashable:base,
-    hslogger:base,
-    monoid-extras:base,
-    newtype-generics:base,
-    parallel:base,
-    regex-base:base,
-    regex-tdfa:base,
-    statestack:base,
-    svg-builder:base,
-    these:base,
-    time-compat:base
-
+    floskell:ghc-prim,
+    -- for shake-bench
+    Chart-diagrams:diagrams-core,
+    SVGFonts:diagrams-core

ghcide/ghcide.cabal

@@ -48,6 +48,7 @@ library
         dependent-map,
         dependent-sum,
         dlist,
+        -- we can't use >= 1.7.10 while we have to use hlint == 3.2.*
         extra >= 1.7.4 && < 1.7.10,
         fuzzy,
         filepath,

plugins/hls-call-hierarchy-plugin/README.md

@@ -20,6 +20,7 @@ Enabled by default. You can disable it in your editor settings whenever you like
 {
   "haskell.plugin.callHierarchy.globalOn": true
 }
+```
 
 ## Change log
 ### 1.0.0.1

plugins/hls-call-hierarchy-plugin/hls-call-hierarchy-plugin.cabal

@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               hls-call-hierarchy-plugin
-version:            1.0.0.1
+version:            1.0.0.2
 synopsis:           Call hierarchy plugin for Haskell Language Server
 license:            Apache-2.0
 license-file:       LICENSE

plugins/hls-call-hierarchy-plugin/src/Ide/Plugin/CallHierarchy/Internal.hs

@@ -46,7 +46,7 @@ prepareCallHierarchy state pluginId param
     liftIO (runAction "CallHierarchy.prepareHierarchy" state (prepareCallHierarchyItem nfp pos)) >>=
       \case
         Just items -> pure $ Right $ Just $ List items
-        Nothing    -> pure $ Left $ responseError "Call Hierarchy: No result"
+        Nothing    -> pure $ Right Nothing
   | otherwise = pure $ Left $ responseError $ T.pack $ "Call Hierarchy: uriToNormalizedFilePath failed for: " <> show uri
   where
     uri = param ^. (L.textDocument . L.uri)
@@ -66,23 +66,28 @@ constructFromAst nfp pos =
 resolveIntoCallHierarchy :: Applicative f => HieASTs a -> Position -> NormalizedFilePath -> f (Maybe [CallHierarchyItem])
 resolveIntoCallHierarchy hf pos nfp =
   case listToMaybe $ pointCommand hf pos extract of
-    Just res -> pure $ Just $ mapMaybe (construct nfp hf) res
-    Nothing  -> pure Nothing
+    Nothing    -> pure Nothing
+    Just infos ->
+      case mapMaybe (construct nfp hf) infos of
+        []  -> pure Nothing
+        res -> pure $ Just res
 
 extract :: HieAST a -> [(Identifier, S.Set ContextInfo, Span)]
 extract ast = let span = nodeSpan ast
                   infos = M.toList $ M.map identInfo (Compat.getNodeIds ast)
               in  [ (ident, contexts, span) | (ident, contexts) <- infos ]
 
 recFieldInfo, declInfo, valBindInfo, classTyDeclInfo,
-  useInfo, patternBindInfo, tyDeclInfo :: [ContextInfo] -> Maybe ContextInfo
-recFieldInfo    ctxs = listToMaybe [ctx    | ctx@RecField{}    <- ctxs]
-declInfo        ctxs = listToMaybe [ctx    | ctx@Decl{}        <- ctxs]
-valBindInfo     ctxs = listToMaybe [ctx    | ctx@ValBind{}     <- ctxs]
-classTyDeclInfo ctxs = listToMaybe [ctx    | ctx@ClassTyDecl{} <- ctxs]
-useInfo         ctxs = listToMaybe [Use    | Use               <- ctxs]
-patternBindInfo ctxs = listToMaybe [ctx    | ctx@PatternBind{} <- ctxs]
-tyDeclInfo      ctxs = listToMaybe [TyDecl | TyDecl            <- ctxs]
+  useInfo, patternBindInfo, tyDeclInfo, matchBindInfo
+    :: [ContextInfo] -> Maybe ContextInfo
+recFieldInfo    ctxs = listToMaybe [ctx       | ctx@RecField{}    <- ctxs]
+declInfo        ctxs = listToMaybe [ctx       | ctx@Decl{}        <- ctxs]
+valBindInfo     ctxs = listToMaybe [ctx       | ctx@ValBind{}     <- ctxs]
+classTyDeclInfo ctxs = listToMaybe [ctx       | ctx@ClassTyDecl{} <- ctxs]
+useInfo         ctxs = listToMaybe [Use       | Use               <- ctxs]
+patternBindInfo ctxs = listToMaybe [ctx       | ctx@PatternBind{} <- ctxs]
+tyDeclInfo      ctxs = listToMaybe [TyDecl    | TyDecl            <- ctxs]
+matchBindInfo   ctxs = listToMaybe [MatchBind | MatchBind         <- ctxs]
 
 construct :: NormalizedFilePath -> HieASTs a -> (Identifier, S.Set ContextInfo, Span) -> Maybe CallHierarchyItem
 construct nfp hf (ident, contexts, ssp)
@@ -92,6 +97,9 @@ construct nfp hf (ident, contexts, ssp)
     -- ignored type span
     = Just $ mkCallHierarchyItem' ident SkField ssp ssp
 
+  | isJust (matchBindInfo ctxList) && isNothing (valBindInfo ctxList)
+    = Just $ mkCallHierarchyItem' ident SkFunction ssp ssp
+
   | Just ctx <- valBindInfo ctxList
     = Just $ case ctx of
         ValBind _ _ span -> mkCallHierarchyItem' ident SkFunction (renderSpan span) ssp

plugins/hls-call-hierarchy-plugin/src/Ide/Plugin/CallHierarchy/Types.hs

@@ -35,6 +35,7 @@ instance FromRow Vertex where
                    <*> field <*> field <*> field
                    <*> field <*> field <*> field
                    <*> field <*> field
+
 data SymbolPosition = SymbolPosition {
   psl :: Int
 , psc :: Int

plugins/hls-call-hierarchy-plugin/test/Main.hs

@@ -178,6 +178,15 @@ prepareCallHierarchyTests =
               expected = mkCallHierarchyItemV "b" SkFunction range selRange
           oneCaseWithCreate contents 0 2 expected
       ]
+  , testCase "multi pattern" $ do
+      let contents = T.unlines
+            [ "f (Just _) = ()"
+            , "f Nothing = ()"
+            ]
+          range = mkRange 1 0 1 1
+          selRange = mkRange 1 0 1 1
+          expected = mkCallHierarchyItemV "f" SkFunction range selRange
+      oneCaseWithCreate contents 1 0 expected
   ]
 
 incomingCallsTests :: TestTree
@@ -263,6 +272,15 @@ incomingCallsTests =
             positions = [(1, 5)]
             ranges = [mkRange 1 13 1 14]
         incomingCallTestCase contents 1 13 positions ranges
+    , testCase "multi pattern" $ do
+        let contents = T.unlines
+                [ "f 1 = 1"
+                , "f 2 = 2"
+                , "g = f"
+                ]
+            positions = [(2, 0)]
+            ranges = [mkRange 2 4 2 5]
+        incomingCallTestCase contents 1 0 positions ranges
     ]
   , testGroup "multi file"
     [ testCase "1" $ do

stack-9.0.1.yaml

@@ -1,5 +1,4 @@
-resolver: nightly-2021-05-02
-compiler: ghc-9.0.1
+resolver: nightly-2021-08-26
 
 packages:
   - .
@@ -8,7 +7,7 @@ packages:
   - ./ghcide/
   - ./hls-plugin-api
   - ./hls-test-utils
-  # - ./shake-bench
+  - ./shake-bench
   - ./plugins/hls-call-hierarchy-plugin
   # - ./plugins/hls-class-plugin
   - ./plugins/hls-haddock-comments-plugin
@@ -22,58 +21,44 @@ packages:
   # - ./plugins/hls-tactics-plugin
   # - ./plugins/hls-brittany-plugin
   # - ./plugins/hls-stylish-haskell-plugin
-  # - ./plugins/hls-floskell-plugin
+  - ./plugins/hls-floskell-plugin
   # - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
   - ./plugins/hls-module-name-plugin
-  # - ./plugins/hls-ormolu-plugin
+  - ./plugins/hls-ormolu-plugin
 
 ghc-options:
   "$everything": -haddock
 
 extra-deps:
-- apply-refact-0.9.3.0
-- base16-bytestring-0.1.1.7@sha256:0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3,2231
+
+- blaze-textual-0.2.2.1
 - bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727
-# Not newest (constraints-extras doesn't support 0.13 yet)
-- constraints-0.12@sha256:71c7999d7fa01d8941f08d37d4c107c6b1bcbd0306e234157557b9b096b7f1be,2217
-- constraints-extras-0.3.1.0@sha256:12016ebb91ad5ed2c82bf7e48c6bd6947d164d33c9dca5ac3965de1bb6c780c0,1777
 - dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657
 - dependent-sum-0.7.1.0@sha256:0e419237f5b86da3659772afff9cab355c0f8d5b3fdb15a5b30e673d8dc83941,2147
-- ghc-lib-9.0.1.20210324@sha256:c8b9a2541ea3424c8d0e4f80584477d0f35be03f4a47d931152042d5f446c5fc,19279
-- ghc-lib-parser-9.0.1.20210324@sha256:fb680f78d4ab08b5d089a05bda3b84ad857e5edcc2e4ca7c188c0207d369af80
-- ghc-lib-parser-ex-9.0.0.4@sha256:8282b11c3797fc8ba225b245e736cc9a0745d9c48d0f9fea7f9bffb5c9997709,3642
+- floskell-0.10.5
 - ghc-source-gen-0.4.1.0
-- haddock-library-1.10.0@sha256:2a6c239da9225951a5d837e1ce373faeeae60d1345c78dd0a0b0f29df30c4fe9,4098
 - heapsize-0.3.0.1@sha256:0b69aa97a46d819b700ac7b145f3b5493c3565cf2c5b8298682238d405d0326e,1417
+- hie-bios-0.7.6
 - hiedb-0.4.0.0
-- hlint-3.3@sha256:4218ad6e03050f5d68aeba0e025f5f05e366c8fd49657f2a19df04ee31b2bb23,4154
+- hspec-2.7.10
+- hspec-core-2.7.10
+- hspec-discover-2.7.10
 - implicit-hie-0.1.2.6
 - implicit-hie-cradle-0.3.0.5
-- lens-5.0.1
-- profunctors-5.6.2
+- monad-dijkstra-0.1.1.2
 - refinery-0.4.0.0
 - retrie-1.0.0.0
-- some-1.0.2@sha256:3d460998df32ad7b93bf55657aeae988d97070155e71718b4bc75d0997ce9d62,2244
+- some-1.0.2
 - lsp-1.2.0.1
 - lsp-types-1.3.0.1
 - lsp-test-0.14.0.1
-
-# Upstream patches for ghc-9.0.1 compatability
-# Same as in cabal.project
-- github: jwaldmann/blaze-textual
-  commit: d8ee6cf80e27f9619d621c936bb4bda4b99a183f
-# https://github.com/jwaldmann/blaze-textual/commit/d8ee6cf80e27f9619d621c936bb4bda4b99a183f
-# https://github.com/bos/blaze-textual/issues/13
+- sqlite-simple-0.4.18.0
 
 - github: mithrandi/czipwith
   commit: b6245884ae83e00dd2b5261762549b37390179f8
 # https://github.com/lspitzner/czipwith/pull/2
 
-- github: jneira/hie-bios
-  commit: 9b1445ab5efcabfad54043fc9b8e50e9d8c5bbf3
-# https://github.com/mpickering/hie-bios/pull/285
-
 - github: hsyl20/ghc-api-compat
   commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
 
@@ -88,15 +73,26 @@ extra-deps:
   - dependent-sum-template
 # https://github.com/obsidiansystems/dependent-sum/pull/57
 
+# shake-bench dependencies
+
+- SVGFonts-1.7.0.1@sha256:44f0e5ee69a0c41de72bfc1408d1384719ec44b2f1a83fd4da31071d9da21f84,4004
+- diagrams-postscript-1.5@sha256:ea9ef970f653072cfde9715fad92481eedcc72a94da543c52a68ca33100902ab,2369
+- Chart-1.9.3@sha256:640a38463318b070d80a049577e4f0b3322df98290abb7afcf0cb74a4ad5b512,2948
+- Chart-diagrams-1.9.3@sha256:1535d5d0d3febca63138cecfde234315212611c21bb7f4358b2dae8c55c59003,1801
+- statestack-0.3@sha256:be43ce2cd790a4732b88cdc9480458503cb5e307b4f79a502d99d5b3d417730e,1135
+
 - github: diagrams/active
   commit: ca23431a8dfa013992f9164ccc882a3277361f17
 # https://github.com/diagrams/active/pull/36
 
-
-# benchmark dependency
 - github: HeinrichApfelmus/operational
   commit: 16e19aaf34e286f3d27b3988c61040823ec66537
 
+# end of shake-bench dpendencies
+
+# due to floskell-0.10.5 and diagrams-core-1.5.0
+allow-newer: true
+
 configure-options:
   ghcide:
       - --disable-library-for-ghci
@@ -108,13 +104,12 @@ configure-options:
 flags:
   haskell-language-server:
     pedantic: true
+
     class: false
     splice: false
     refineImports: false
     tactic: false # Dependencies fail
 
-    floskell: false
-    ormolu: false
     fourmolu: false
     stylishHaskell: false
     brittany: false