move references out

Author: soulomoon

ghcide/src/Development/IDE/LSP/HoverDefinition.hs

@@ -10,7 +10,7 @@ module Development.IDE.LSP.HoverDefinition
     , gotoDefinition
     , gotoTypeDefinition
     , documentHighlight
-    , references
+    -- , references
     -- , wsSymbols
     ) where
 
@@ -39,14 +39,6 @@ gotoTypeDefinition = request "TypeDefinition" getTypeDefinition (InR $ InR Null)
 hover          = request "Hover"      getAtPoint     (InR Null)     foundHover
 documentHighlight = request "DocumentHighlight" highlightAtPoint (InR Null) InL
 
-references :: PluginMethodHandler IdeState Method_TextDocumentReferences
-references ide _ (ReferenceParams (TextDocumentIdentifier uri) pos _ _ _) = do
-  nfp <- getNormalizedFilePathE uri
-  liftIO $ logDebug (ideLogger ide) $
-        "References request at position " <> T.pack (showPosition pos) <>
-        " in file: " <> T.pack (show nfp)
-  InL <$> (liftIO $ runAction "references" ide $ refsAtPoint nfp pos)
-
 
 foundHover :: (Maybe Range, [T.Text]) -> Hover |? Null
 foundHover (mbRange, contents) =

ghcide/src/Development/IDE/Plugin/HLS/GhcIde.hs

@@ -51,7 +51,7 @@ descriptor plId = (defaultPluginDescriptor plId desc)
                       gotoTypeDefinition ide TextDocumentPositionParams{..})
                   <> mkPluginHandler SMethod_TextDocumentDocumentHighlight (\ide _ DocumentHighlightParams{..} ->
                       documentHighlight ide TextDocumentPositionParams{..})
-                  <> mkPluginHandler SMethod_TextDocumentReferences references,
+                  ,
 
     pluginConfigDescriptor = defaultConfigDescriptor
   }

plugins/hls-core-plugin/src/Ide/Plugin/Core.hs

@@ -6,12 +6,16 @@ module Ide.Plugin.Core(descriptor, CoreLog) where
 import           Control.Monad.IO.Class        (liftIO)
 import           Data.Maybe                    (fromMaybe)
 import           Data.Text                     (Text)
+import qualified Data.Text                     as T
 import           Development.IDE
-import           Development.IDE.Core.Actions  (workspaceSymbols)
+import           Development.IDE.Core.Actions  (refsAtPoint, workspaceSymbols)
 import qualified Development.IDE.Core.Shake    as Shake
+import           Ide.Plugin.Error              (getNormalizedFilePathE)
 import           Ide.Types
 import           Language.LSP.Protocol.Message
-import           Language.LSP.Protocol.Types   (WorkspaceSymbolParams (..),
+import           Language.LSP.Protocol.Types   (ReferenceParams (..),
+                                                TextDocumentIdentifier (..),
+                                                WorkspaceSymbolParams (..),
                                                 type (|?) (InL))
 
 data CoreLog
@@ -29,11 +33,23 @@ descriptor :: Recorder (WithPriority CoreLog) -> PluginId -> PluginDescriptor Id
 descriptor recorder plId =
   (defaultPluginDescriptor plId "Provides core IDE features for Haskell")
     {
-        Ide.Types.pluginHandlers = mkPluginHandler SMethod_WorkspaceSymbol (wsSymbols recorder)
+        Ide.Types.pluginHandlers =
+            mkPluginHandler SMethod_WorkspaceSymbol (wsSymbols recorder)
+            <> mkPluginHandler SMethod_TextDocumentReferences references
     }
 
 
 wsSymbols :: Recorder (WithPriority CoreLog) -> PluginMethodHandler IdeState Method_WorkspaceSymbol
 wsSymbols logger ide _ (WorkspaceSymbolParams _ _ query) = liftIO $ do
   logWith logger Debug $ CoreLogMsg $ "Workspace symbols request: " <> query
   runIdeAction "WorkspaceSymbols" (shakeExtras ide) $ InL . fromMaybe [] <$> workspaceSymbols query
+
+
+
+references :: PluginMethodHandler IdeState Method_TextDocumentReferences
+references ide _ (ReferenceParams (TextDocumentIdentifier uri) pos _ _ _) = do
+  nfp <- getNormalizedFilePathE uri
+  liftIO $ logDebug (ideLogger ide) $
+        "References request at position " <> T.pack (showPosition pos) <>
+        " in file: " <> T.pack (show nfp)
+  InL <$> (liftIO $ runAction "references" ide $ refsAtPoint nfp pos)