Fix cross package goto definition (digital-asset#1834)

The reason for why it was broken was rather simple: We just lost the non-compat logic somewhere along the way. fixes digital-asset#1582
kgeonw · Jun 24, 2019 · d828956 · d828956
1 parent 0b396be
commit d828956
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/compiler/hie-core/src/Development/IDE/Core/Rules.hs b/compiler/hie-core/src/Development/IDE/Core/Rules.hs
@@ -281,7 +281,7 @@ getHieFileRule =
     defineNoFile $ \(GetHieFile f) -> do
         u <- liftIO $ mkSplitUniqSupply 'a'
         let nameCache = initNameCache u []
-        liftIO $ fmap fst $ readHieFile nameCache f
+        liftIO $ fmap (hie_file_result . fst) $ readHieFile nameCache f
 
 -- | A rule that wires per-file rules together
 mainRule :: Rules ()

diff --git a/compiler/hie-core/src/Development/IDE/GHC/Compat.hs b/compiler/hie-core/src/Development/IDE/GHC/Compat.hs
@@ -5,12 +5,18 @@
 
 -- | Attempt at hiding the GHC version differences we can.
 module Development.IDE.GHC.Compat(
+    HieFileResult(..),
     HieFile(..),
     mkHieFile,
     writeHieFile,
     readHieFile
     ) where
 
+#ifndef GHC_STABLE
+import HieAst
+import HieBin
+import HieTypes
+#else
 import GHC
 import GhcPlugins
 import NameCache
@@ -24,7 +30,9 @@ mkHieFile _ _ _ = return (HieFile () [])
 writeHieFile :: FilePath -> HieFile -> IO ()
 writeHieFile _ _ = return ()
 
-readHieFile :: NameCache -> FilePath -> IO (HieFile, ())
-readHieFile _ _ = return (HieFile () [], ())
+readHieFile :: NameCache -> FilePath -> IO (HieFileResult, ())
+readHieFile _ _ = return (HieFileResult (HieFile () []), ())
 
 data HieFile = HieFile {hie_module :: (), hie_exports :: [AvailInfo]}
+data HieFileResult = HieFileResult { hie_file_result :: HieFile }
+#endif
diff --git a/daml-foundations/daml-ghc/test-src/DA/Test/ShakeIdeClient.hs b/daml-foundations/daml-ghc/test-src/DA/Test/ShakeIdeClient.hs
@@ -439,9 +439,6 @@ goToDefinitionTests mbScenarioService = Tasty.testGroup "Go to definition tests"
             expectGoToDefinition (foo,1,[17..17]) (At (foo,4,0))
             -- B
             expectGoToDefinition (foo,1,[19..19]) (At (foo,4,9))
-{-
-    -- Disabled for now. See issue
-    -- https://github.com/digital-asset/daml/issues/1582
     ,    testCase' "Cross-package goto definition" $ do
             foo <- makeModule "Foo"
                 [ "test = scenario do"
@@ -451,7 +448,6 @@ goToDefinitionTests mbScenarioService = Tasty.testGroup "Go to definition tests"
             setFilesOfInterest [foo]
             expectNoErrors
             expectGoToDefinition (foo, 3, [7..14]) (In "DA.Internal.LF")
--}
     ]
     where
         testCase' = testCase mbScenarioService