add core actions

Author: soulomoon

ghcide/src/Development/IDE/Core/Actions.hs

@@ -4,7 +4,6 @@ module Development.IDE.Core.Actions
 , getDefinition
 , getTypeDefinition
 , highlightAtPoint
-, refsAtPoint
 , workspaceSymbols
 , lookupMod
 ) where
@@ -124,16 +123,4 @@ highlightAtPoint file pos = runMaybeT $ do
     let toCurrentHighlight (DocumentHighlight range t) = flip DocumentHighlight t <$> toCurrentRange mapping range
     mapMaybe toCurrentHighlight <$>AtPoint.documentHighlight hf rf pos'
 
--- Refs are not an IDE action, so it is OK to be slow and (more) accurate
-refsAtPoint :: NormalizedFilePath -> Position -> Action [Location]
-refsAtPoint file pos = do
-    ShakeExtras{withHieDb} <- getShakeExtras
-    fs <- HM.keys <$> getFilesOfInterestUntracked
-    asts <- HM.fromList . mapMaybe sequence . zip fs <$> usesWithStale GetHieAst fs
-    AtPoint.referencesAtPoint withHieDb file pos (AtPoint.FOIReferences asts)
 
-workspaceSymbols :: T.Text -> IdeAction (Maybe [SymbolInformation])
-workspaceSymbols query = runMaybeT $ do
-  ShakeExtras{withHieDb} <- ask
-  res <- liftIO $ withHieDb (\hieDb -> HieDb.searchDef hieDb $ T.unpack query)
-  pure $ mapMaybe AtPoint.defRowToSymbolInfo res

haskell-language-server.cabal

@@ -1619,6 +1619,7 @@ library hls-core-plugin
   buildable: True
   exposed-modules:
     Ide.Plugin.Core
+    Ide.Plugin.Core.Actions
 
   hs-source-dirs:     plugins/hls-core-plugin/src
   build-depends:

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

@@ -8,8 +8,8 @@ import           Data.Maybe                    (fromMaybe)
 import           Data.Text                     (Text)
 import qualified Data.Text                     as T
 import           Development.IDE
-import           Development.IDE.Core.Actions  (refsAtPoint, workspaceSymbols)
 import qualified Development.IDE.Core.Shake    as Shake
+import           Ide.Plugin.Core.Actions       (refsAtPoint, workspaceSymbols)
 import           Ide.Plugin.Error              (getNormalizedFilePathE)
 import           Ide.Types
 import           Language.LSP.Protocol.Message

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

@@ -0,0 +1,39 @@
+module Ide.Plugin.Core.Actions where
+
+import           Control.Monad.Extra                  (mapMaybeM)
+import           Control.Monad.Reader
+import           Control.Monad.Trans.Maybe
+import           Data.Maybe
+import qualified Data.Text                            as T
+import           Data.Tuple.Extra
+import           Development.IDE.Core.OfInterest
+import           Development.IDE.Core.PluginUtils
+import           Development.IDE.Core.PositionMapping
+import           Development.IDE.Core.RuleTypes
+import           Development.IDE.Core.Service
+import           Development.IDE.Core.Shake
+import           Development.IDE.GHC.Compat           hiding (writeHieFile)
+import           Development.IDE.Graph
+import qualified Development.IDE.Spans.AtPoint        as AtPoint
+import           Development.IDE.Types.HscEnvEq       (hscEnv)
+import           Development.IDE.Types.Location
+import           Language.LSP.Protocol.Types          (DocumentHighlight (..),
+                                                       SymbolInformation (..),
+                                                       normalizedFilePathToUri,
+                                                       uriToNormalizedFilePath)
+
+
+-- Refs are not an IDE action, so it is OK to be slow and (more) accurate
+refsAtPoint :: NormalizedFilePath -> Position -> Action [Location]
+refsAtPoint file pos = do
+    ShakeExtras{withHieDb} <- getShakeExtras
+    fs <- HM.keys <$> getFilesOfInterestUntracked
+    asts <- HM.fromList . mapMaybe sequence . zip fs <$> usesWithStale GetHieAst fs
+    AtPoint.referencesAtPoint withHieDb file pos (AtPoint.FOIReferences asts)
+
+
+workspaceSymbols :: T.Text -> IdeAction (Maybe [SymbolInformation])
+workspaceSymbols query = runMaybeT $ do
+  ShakeExtras{withHieDb} <- ask
+  res <- liftIO $ withHieDb (\hieDb -> HieDb.searchDef hieDb $ T.unpack query)
+  pure $ mapMaybe AtPoint.defRowToSymbolInfo res