Provide symbols from ghcide too

Author: alanz

ghcide

@@ -448,7 +448,7 @@ makeSymbols sps lf ideState params
                       si = SymbolInformation name' (ds ^. kind) (ds ^. deprecated) loc parent
                   in [si] <> children'
 
-      mhs <- mapM (\(_,p) -> p ideState params) sps
+      mhs <- mapM (\(_,p) -> p lf ideState params) sps
       case rights mhs of
           [] -> return $ Left $ responseError $ T.pack $ show $ lefts mhs
           hs -> return $ Right $ convertSymbols $ concat hs

src/Ide/Plugin.hs

@@ -194,7 +194,7 @@ logAndRunRequest label getResults ide pos path = do
 -- ---------------------------------------------------------------------
 
 symbols :: SymbolsProvider
-symbols _ide (DocumentSymbolParams _doc _mt)
+symbols _lf _ide (DocumentSymbolParams _doc _mt)
     = pure $ Right [r]
     where
         r = DocumentSymbol name detail kind deprecation range selR chList

src/Ide/Plugin/Example.hs

@@ -191,7 +191,7 @@ logAndRunRequest label getResults ide pos path = do
 -- ---------------------------------------------------------------------
 
 symbols :: SymbolsProvider
-symbols _ide (DocumentSymbolParams _doc _mt)
+symbols _lf _ide (DocumentSymbolParams _doc _mt)
     = pure $ Right [r]
     where
         r = DocumentSymbol name detail kind deprecation range selR chList

src/Ide/Plugin/Example2.hs

@@ -8,8 +8,10 @@ module Ide.Plugin.GhcIde
 import Data.Aeson
 import Development.IDE.Core.Service
 import Development.IDE.LSP.HoverDefinition
+import Development.IDE.LSP.Outline
 import Development.IDE.Plugin.CodeAction
 import Development.IDE.Types.Logger
+import Ide.Plugin
 import Ide.Types
 import Language.Haskell.LSP.Types
 import Text.Regex.TDFA.Text()
@@ -25,7 +27,7 @@ descriptor plId = PluginDescriptor
   , pluginCodeLensProvider   = Just codeLens'
   , pluginDiagnosticProvider = Nothing
   , pluginHoverProvider      = Just hover'
-  , pluginSymbolsProvider    = Nothing
+  , pluginSymbolsProvider    = Just symbolsProvider
   , pluginFormattingProvider = Nothing
   , pluginCompletionProvider = Nothing
   }
@@ -54,3 +56,14 @@ codeLens' :: CodeLensProvider
 codeLens' lf ide _ params = codeLens lf ide params
 
 -- ---------------------------------------------------------------------
+
+symbolsProvider :: SymbolsProvider
+symbolsProvider ls ide params = do
+    ds <- moduleOutline ls ide params
+    case ds of
+        Right (DSDocumentSymbols (List ls)) -> return $ Right ls
+        Right (DSSymbolInformation (List _si)) ->
+            return $ Left $ responseError "GhcIde.symbolsProvider: DSSymbolInformation deprecated"
+        Left err -> return $ Left err
+
+-- ---------------------------------------------------------------------

src/Ide/Plugin/GhcIde.hs

@@ -132,7 +132,8 @@ data DiagnosticTrigger = DiagnosticOnOpen
 -- type HoverProvider = Uri -> Position -> IO (Either ResponseError [Hover])
 type HoverProvider = IdeState -> TextDocumentPositionParams -> IO (Either ResponseError (Maybe Hover))
 
-type SymbolsProvider = IdeState
+type SymbolsProvider = LSP.LspFuncs Config
+                     -> IdeState
                      -> DocumentSymbolParams
                      -> IO (Either ResponseError [DocumentSymbol])