Fix resolution of qualified selectors in wildcards.

Author: phischu

src/Language/Haskell/Names/Annotated.hs

@@ -52,9 +52,8 @@ annotateRec _ sc a = go sc a where
               namesRes = do
                 f <- sc ^. wcNames
                 let localQName = qualifyName Nothing (setAnn (sLoc l) (wcFieldName f))
-                    selectorQName = qualifyName (Just (wcFieldModuleName f)) (wcFieldName f)
+                    symbol = wcFieldSymbol f
                 Scoped info _ <- return (lookupQName localQName sc)
-                Scoped (GlobalSymbol symbol _) _ <- return (lookupQName selectorQName (exprRS sc))
                 return (symbol, info)
           _ -> rmap go sc a
     | Just (Refl :: PatField (Scoped l) :~: a) <- eqT
@@ -63,8 +62,7 @@ annotateRec _ sc a = go sc a where
             PFieldWildcard (Scoped (RecPatWildcard namesRes) (sLoc l)) where
               namesRes = do
                 f <- sc ^. wcNames
-                let qname = qualifyName (Just (wcFieldModuleName f)) (wcFieldName f)
-                Scoped (GlobalSymbol symbol _) _ <- return (lookupQName qname (exprRS sc))
+                let symbol = wcFieldSymbol f
                 return symbol
           _ -> rmap go sc a
     | otherwise

src/Language/Haskell/Names/RecordWildcards.hs

@@ -26,8 +26,8 @@ type WcNames = [WcField]
 data WcField = WcField
   { wcFieldName :: Name ()
     -- ^ the field's simple name
-  , wcFieldModuleName :: ModuleName ()
-    -- ^ the field's original name
+  , wcFieldSymbol :: Symbol
+    -- ^ the field's selector symbol
   , wcExistsGlobalValue :: Bool
     -- ^ whether there is a global value in scope with the same name as
     -- the field but different from the field selector
@@ -76,7 +76,7 @@ getElidedFields globalTable con fields =
         let name = symbolName symbol
             wcfield = WcField
                 { wcFieldName = name
-                , wcFieldModuleName = symbolModule symbol
+                , wcFieldSymbol = symbol
                 , wcExistsGlobalValue = existsGlobalValue name
             }
         return (name,wcfield))

tests/annotations/WildcardsQualified.hs

@@ -0,0 +1,8 @@
+{-# LANGUAGE RecordWildCards #-}
+module WildcardsQualified where
+
+import qualified Prelude as P (DataTypeWithSelectors(DataTypeWithSelectors,selector1))
+
+u :: DataTypeWithSelectors -> ()
+u P.DataTypeWithSelectors{..} = let x = selector1 in ()
+

tests/annotations/WildcardsQualified.hs.golden

@@ -0,0 +1,16 @@
+RecordWildCards at 1:14 is none
+DataTypeWithSelectors at 4:32 is import part for a global data type, Prelude.DataTypeWithSelectors
+DataTypeWithSelectors at 4:54 is a global constructor, Prelude.DataTypeWithSelectors
+selector1 at 4:76 is a global selector, Prelude.selector1
+u        at  6:1 is a global value, WildcardsQualified.u
+DataTypeWithSelectors at  6:6 is not in scope
+DataTypeWithSelectors at  6:6 is not in scope
+()       at 6:31 is none
+u        at  7:1 is a value bound here
+DataTypeWithSelectors at  7:3 is a global constructor, Prelude.DataTypeWithSelectors
+DataTypeWithSelectors at  7:3 is a global constructor, Prelude.DataTypeWithSelectors
+..       at 7:27 is a record pattern wildcard which brings the following fields: Prelude.selector1
+x        at 7:37 is a value bound here
+selector1 at 7:41 is a local value defined at 7:27
+selector1 at 7:41 is a local value defined at 7:27
+()       at 7:54 is none