Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable the ghcide test plugin in HLS test suites #2243

Merged
merged 11 commits into from
Oct 4, 2021
Merged

Enable the ghcide test plugin in HLS test suites #2243

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6116906
convert to HLS plugin
pepeiborra Sep 26, 2021
f4db11f
remove unnecessary check
pepeiborra Sep 26, 2021
4e13703
use waitForBUildQueue in the Tactics test suite
pepeiborra Sep 27, 2021
29813bc
use waitForBuildQueue in the splice test suite
pepeiborra Sep 27, 2021
7a0e53d
use waitForBuildQueue in golden test helpers
pepeiborra Sep 27, 2021
3f36a9d
really enable Test plugin
pepeiborra Sep 27, 2021
2ebeba4
silenceStdErr to honor LSP_TEST_LOG_STDERR
pepeiborra Sep 29, 2021
1ce6cc9
Disable timeout in tactics testsuite
pepeiborra Oct 1, 2021
6b29d09
no longer silence stderr
pepeiborra Oct 1, 2021
869849d
silence the tactics plugin
pepeiborra Oct 1, 2021
865dc8d
fix ModLocation for nameless modules
pepeiborra Oct 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ghcide/exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,7 @@ main = do
pluginDescToIdePlugins $
GhcIde.descriptors
++ [Test.blockCommandDescriptor "block-command" | argsTesting]

,Main.argsGhcidePlugin = if argsTesting
then Test.plugin
else mempty
++ [Test.plugin | argsTesting]

,Main.argsThreads = case argsThreads of 0 -> Nothing ; i -> Just (fromIntegral i)

Expand Down
14 changes: 6 additions & 8 deletions ghcide/src/Development/IDE/Plugin/Test.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{-# LANGUAGE DeriveAnyClass #-}
{-# LANGUAGE DerivingStrategies #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE PolyKinds #-}
-- | A plugin that adds custom messages for use in tests
module Development.IDE.Plugin.Test
( TestRequest(..)
Expand All @@ -18,7 +19,6 @@ import Data.Aeson
import Data.Aeson.Types
import Data.Bifunctor
import Data.CaseInsensitive (CI, original)
import Data.Default (def)
import Data.Maybe (isJust)
import Data.String
import Data.Text (Text, pack)
Expand All @@ -27,8 +27,6 @@ import Development.IDE.Core.Service
import Development.IDE.Core.Shake
import Development.IDE.GHC.Compat
import Development.IDE.Graph (Action)
import Development.IDE.LSP.Server
import qualified Development.IDE.Plugin as P
import Development.IDE.Types.Action
import Development.IDE.Types.HscEnvEq (HscEnvEq (hscEnv))
import Development.IDE.Types.Location (fromUri)
Expand All @@ -50,11 +48,11 @@ data TestRequest
newtype WaitForIdeRuleResult = WaitForIdeRuleResult { ideResultSuccess::Bool}
deriving newtype (FromJSON, ToJSON)

plugin :: P.Plugin c
plugin = def {
P.pluginRules = return (),
P.pluginHandlers = requestHandler (SCustomMethod "test") testRequestHandler'
}
plugin :: PluginDescriptor IdeState
plugin = (defaultPluginDescriptor "test") {
pluginHandlers = mkPluginHandler (SCustomMethod "test") $ \st _ ->
testRequestHandler' st
}
where
testRequestHandler' ide req
| Just customReq <- parseMaybe parseJSON req
Expand Down
11 changes: 8 additions & 3 deletions hls-plugin-api/src/Ide/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ import GHC.Generics
import Ide.Plugin.Config
import Ide.Plugin.Properties
import Language.LSP.Server (LspM, getVirtualFile)
import Language.LSP.Types hiding (SemanticTokenAbsolute(length, line), SemanticTokenRelative(length), SemanticTokensEdit(_start))
import Language.LSP.Types hiding
(SemanticTokenAbsolute (length, line),
SemanticTokenRelative (length),
SemanticTokensEdit (_start))
import Language.LSP.Types.Capabilities (ClientCapabilities (ClientCapabilities),
TextDocumentClientCapabilities (_codeAction, _documentSymbol))
import Language.LSP.Types.Lens as J (HasChildren (children),
Expand Down Expand Up @@ -285,6 +288,10 @@ instance PluginMethod CallHierarchyIncomingCalls where
instance PluginMethod CallHierarchyOutgoingCalls where
pluginEnabled _ = pluginEnabledConfig plcCallHierarchyOn

instance PluginMethod CustomMethod where
pluginEnabled _ _ _ = True
combineResponses _ _ _ _ (x :| _) = x

-- ---------------------------------------------------------------------

-- | Methods which have a PluginMethod instance
Expand Down Expand Up @@ -488,8 +495,6 @@ instance HasTracing CallHierarchyOutgoingCallsParams
-- ---------------------------------------------------------------------

{-# NOINLINE pROCESS_ID #-}
{-# LANGUAGE DerivingStrategies #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
pROCESS_ID :: T.Text
pROCESS_ID = unsafePerformIO getPid

Expand Down