add test

Author: soulomoon

ghcide/ghcide.cabal

@@ -372,7 +372,6 @@ test-suite ghcide-tests
     LogType
     NonLspCommandLine
     OpenCloseTest
-    OutlineTests
     PluginSimpleTests
     PositionMappingTests
     PreprocessorTests

ghcide/test/exe/Main.hs

@@ -96,7 +96,6 @@ main = do
     , CPPTests.tests
     , DiagnosticTests.tests
     , CodeLensTests.tests
-    , OutlineTests.tests
     , HighlightTests.tests
     , FindDefinitionAndHoverTests.tests
     , PluginSimpleTests.tests

ghcide/test/exe/OutlineTests.hs

@@ -1763,6 +1763,9 @@ test-suite hls-core-plugin-tests
   main-is:          CoreTest.hs
   other-modules:
     InitializeResponseTests
+    OutlineTests
+    Util
+
 
   build-depends:
     , aeson

haskell-language-server.cabal

@@ -49,9 +49,9 @@ descriptor recorder plId =
                       gotoTypeDefinition ide TextDocumentPositionParams{..})
                   <> mkPluginHandler SMethod_TextDocumentDocumentHighlight (\ide _ DocumentHighlightParams{..} ->
                       documentHighlight ide TextDocumentPositionParams{..})
-            <> mkPluginHandler SMethod_TextDocumentHover hover'
-            <> mkPluginHandler SMethod_WorkspaceSymbol (wsSymbols recorder)
-            <> mkPluginHandler SMethod_TextDocumentReferences references
+                  <> mkPluginHandler SMethod_TextDocumentHover hover'
+                  <> mkPluginHandler SMethod_WorkspaceSymbol (wsSymbols recorder)
+                  <> mkPluginHandler SMethod_TextDocumentReferences references
     }
 
 

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

@@ -3,6 +3,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 import qualified InitializeResponseTests
+import qualified OutlineTests
 import           Test.Hls                (defaultTestRunner, testGroup)
 
 
@@ -11,4 +12,6 @@ main =
   defaultTestRunner $
     testGroup
       "core"
-      [ InitializeResponseTests.tests ]
+      [ InitializeResponseTests.tests
+      , OutlineTests.tests
+      ]

plugins/hls-core-plugin/test/CoreTest.hs

@@ -13,6 +13,7 @@ import           Development.IDE.Plugin.TypeLenses (typeLensCommandId)
 import qualified Language.LSP.Protocol.Lens        as L
 import           Language.LSP.Protocol.Message
 import           Language.LSP.Test
+import           Util
 
 import           Control.Lens                      ((^.))
 import           Data.Default                      (def)
@@ -46,9 +47,6 @@ import           Test.Hls.FileSystem               (file, text)
 import           Test.Tasty
 import           Test.Tasty.HUnit
 
-corePlugin :: PluginTestDescriptor Core.CoreLog
-corePlugin = mkPluginTestDescriptor Core.descriptor "core"
-
 tests :: TestTree
 tests = withResource acquire release tests where
 
@@ -125,15 +123,4 @@ tests = withResource acquire release tests where
   release :: TResponseMessage Method_Initialize -> IO ()
   release = mempty
 
-directFile :: FilePath -> Text -> [FS.FileTree]
-directFile fp content =
-  [ FS.directCradle [Text.pack fp]
-  , file fp (text content)
-  ]
-
-mkFs :: [FS.FileTree] -> FS.VirtualFileTree
-mkFs = FS.mkVirtualFileTree testDataDir
-
-testDataDir :: FilePath
-testDataDir = "plugins" </> "core-plugin" </> "test" </> "testdata"