Merge remote-tracking branch 'upstream/master' into batch-load-multi-read

Author: fendor

ghcide-test/data/references/Fields.hs

@@ -0,0 +1,18 @@
+{-# LANGUAGE RecordWildCards #-}
+module Fields where
+
+data Foo = MkFoo
+  {
+    barr :: String,
+    bazz :: String
+  }
+
+fooUse0 :: Foo -> String
+fooUse0 MkFoo{barr} = "5"
+
+fooUse1 :: Foo -> String
+fooUse1 MkFoo{..} = "6"
+
+fooUse2 :: String -> String -> Foo
+fooUse2 bar baz =
+  MkFoo{..}

ghcide-test/data/references/Main.hs

@@ -1,7 +1,7 @@
 module Main where
 
 import References
-
+import Fields
 main :: IO ()
 main = return ()
 
@@ -12,3 +12,6 @@ b = a + 1
 
 acc :: Account
 acc = Savings
+
+fooUse3 :: String -> String -> Foo
+fooUse3 bar baz = MkFoo{barr = bar, bazz = baz}

ghcide-test/data/references/hie.yaml

@@ -1 +1 @@
-cradle: {direct: {arguments: ["Main","OtherModule","OtherOtherModule","References"]}}
+cradle: {direct: {arguments: ["Main","OtherModule","OtherOtherModule","References", "Fields"]}}

ghcide-test/exe/ReferenceTests.hs

@@ -156,6 +156,28 @@ tests = testGroup "references"
                           , ("References.hs", 16, 0)
                           ]
           ]
+        -- Fields.hs does not depend on Main.hs
+        -- so we can only find references in Fields.hs
+        , testGroup "references to record fields"
+          [ referenceTest "references record fields in the same file"
+                          ("Fields.hs", 5, 4)
+                          YesIncludeDeclaration
+                          [ ("Fields.hs", 5, 4)
+                          , ("Fields.hs", 10, 14)
+                          , ("Fields.hs", 13, 14)
+                          ]
+
+          -- Main.hs depends on Fields.hs, so we can find references
+          -- from Main.hs to Fields.hs
+          , referenceTest "references record fields cross modules"
+                          ("Main.hs", 16, 24)
+                          YesIncludeDeclaration
+                          [ ("Fields.hs", 5, 4)
+                          , ("Fields.hs", 10, 14)
+                          , ("Fields.hs", 13, 14)
+                          , ("Main.hs", 16, 24)
+                          ]
+          ]
     ]
 
 -- | When we ask for all references to symbol "foo", should the declaration "foo

ghcide/session-loader/Development/IDE/Session.hs

@@ -208,7 +208,7 @@ instance Pretty Log where
 
 -- | Bump this version number when making changes to the format of the data stored in hiedb
 hiedbDataVersion :: String
-hiedbDataVersion = "1"
+hiedbDataVersion = "2"
 
 data SessionLoadingOptions = SessionLoadingOptions
   { findCradle             :: FilePath -> IO (Maybe FilePath)
@@ -705,7 +705,7 @@ type SessionM = ReaderT SessionEnv IO
 -- 2. Check in the cache, whether the given 'hie.yaml' was already loaded before
 -- 3.1. If it wasn't, initialise a new session and continue with step 4.
 -- 3.2. If it is loaded, check whether we need to reload the session, e.g. because the `.cabal` file was modified
--- 3.2.1. If we need to reload, remove the 
+-- 3.2.1. If we need to reload, remove the
 getOptionsLoop :: Recorder (WithPriority Log) -> SessionShake -> SessionState -> TVar (Hashed KnownTargets) -> SessionM ()
 getOptionsLoop recorder sessionShake sessionState knownTargetsVar = forever $ do
   -- Get the next file to load

ghcide/session-loader/Development/IDE/Session/Ghc.hs

@@ -357,6 +357,8 @@ CallStack (from HasCallStack):
   expectJust, called at compiler\\typecheck\\FamInst.hs:461:30 in ghc:FamInst
 ```
 
+and many more.
+
 To mitigate this, we set the cache directory for each component dependent
 on the components of the current `HscEnv`, additionally to the component options
 of the respective components.

ghcide/src/Development/IDE/GHC/Compat/Error.hs

@@ -104,7 +104,7 @@ _MismatchMessage _ report = pure report
 
 -- | Focus 'teq_mismatch_expected' from 'TypeEqMismatch'.
 _TypeEqMismatchExpected :: Traversal' MismatchMsg Type
-#if MIN_VERSION_ghc(9,12,0)
+#if MIN_VERSION_ghc(9,10,2)
 _TypeEqMismatchExpected focus mismatch@(TypeEqMismatch _ _ _ expected _ _ _) =
     (\expected' -> mismatch { teq_mismatch_expected = expected' }) <$> focus expected
 #else
@@ -115,7 +115,7 @@ _TypeEqMismatchExpected _ mismatch = pure mismatch
 
 -- | Focus 'teq_mismatch_actual' from 'TypeEqMismatch'.
 _TypeEqMismatchActual :: Traversal' MismatchMsg Type
-#if MIN_VERSION_ghc(9,12,0)
+#if MIN_VERSION_ghc(9,10,2)
 _TypeEqMismatchActual focus mismatch@(TypeEqMismatch _ _ _ _ actual _ _) =
     (\actual' -> mismatch { teq_mismatch_actual = actual' }) <$> focus actual
 #else

ghcide/src/Development/IDE/Spans/AtPoint.hs

@@ -113,7 +113,7 @@ foiReferencesAtPoint file pos (FOIReferences asts) =
 
 getNamesAtPoint :: HieASTs a -> Position -> PositionMapping -> [Name]
 getNamesAtPoint hf pos mapping =
-  concat $ pointCommand hf posFile (rights . M.keys . getNodeIds)
+  concat $ pointCommand hf posFile (rights . M.keys . getSourceNodeIds)
     where
       posFile = fromMaybe pos $ fromCurrentPosition mapping pos