Fix broken tests for signatures

Author: July541

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

@@ -23,6 +23,7 @@ import qualified Data.HashMap.Strict            as HM
 import           Data.List                      (groupBy, sortBy)
 import qualified Data.Map                       as M
 import           Data.Maybe
+import           Data.Monoid
 import qualified Data.Set                       as S
 import qualified Data.Text                      as T
 import qualified Data.Text.Encoding             as T
@@ -146,12 +147,27 @@ construct nfp hf (ident, contexts, ssp)
 
     renderTyDecl = case ident of
       Left _ -> Nothing
-      Right name -> case getNameBindingInClass name ssp (getAsts hf) of
+      Right name -> case getNameBindingInClass' name ssp (getAsts hf) of
         Nothing -> Nothing
         Just sp -> case resolveIntoCallHierarchy hf (realSrcSpanToRange sp ^. L.start) nfp of
           Just (Just items) -> listToMaybe items
           _                 -> Nothing
 
+getNameBindingInClass'
+  :: Name
+  -> Span
+  -> M.Map HiePath (HieAST a)
+  -> Maybe Span
+getNameBindingInClass' n sp asts = do
+  ast <- M.lookup (HiePath (srcSpanFile sp)) asts
+  clsNode <- selectSmallestContaining sp ast
+  getFirst $ foldMap First $ do
+    child <- flattenAst ast
+    dets <- maybeToList
+      $ M.lookup (Right n) $ sourcedNodeIdents $ sourcedNodeInfo child
+    let binding = foldMap (First . getBindSiteFromContext) (identInfo dets)
+    return (getFirst binding)
+
 mkCallHierarchyItem :: NormalizedFilePath -> Identifier -> SymbolKind -> Span -> Span -> CallHierarchyItem
 mkCallHierarchyItem nfp ident kind span selSpan =
   CallHierarchyItem

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

@@ -166,13 +166,13 @@ prepareCallHierarchyTests =
           expected = mkCallHierarchyItemC "A" SkConstructor range selRange
       oneCaseWithCreate contents 1 13 expected
   , testGroup "type signature"
-      [ knownBrokenForGhcVersions [GHC94] "type signature broken" $ testCase "next line" $ do
+      [ testCase "next line" $ do
           let contents = T.unlines ["a::Int", "a=3"]
               range = mkRange 1 0 1 3
               selRange = mkRange 1 0 1 1
               expected = mkCallHierarchyItemV "a" SkFunction range selRange
           oneCaseWithCreate contents 0 0 expected
-      , knownBrokenForGhcVersions [GHC94] "type signature broken" $ testCase "multi functions" $ do
+      , testCase "multi functions" $ do
           let contents = T.unlines [ "a,b::Int", "a=3", "b=4"]
               range = mkRange 2 0 2 3
               selRange = mkRange 2 0 2 1