Skip to content

Commit f557e6c

Browse files
joyfulmantisjoyfulmantis
authored
Add code lens and fix code actions experiments (#3791)
1 parent a0c4c3b commit f557e6c

File tree

2 files changed

+50
-41
lines changed

2 files changed

+50
-41
lines changed

‎bench/config.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,13 @@ versions:
126126
- HEAD
127127

128128
# A list of plugin configurations to analyze
129+
# WARNING: Currently bench versions later than e4234a3a5e347db249fccefb8e3fb36f89e8eafb
130+
# will be unable to send plugin configurations to earlier HLS versions. This causes
131+
# all plugins in those versions to always be enabled.
132+
# In addition bench proactively disables all plugins it knows about besides the
133+
# ones in the following list. However because it can only disable plugins it
134+
# knows about, any plugins that are in old versions but were removed from HLS
135+
# before the current bench will not be disabled.
129136
configurations:
130137
# A configuration contains one or more plugins:
131138
# - ConfigurationName:

‎ghcide-bench/src/Experiments.hs‎

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import Control.Applicative.Combinators (skipManyTill)
2929
import Control.Concurrent.Async (withAsync)
3030
import Control.Exception.Safe (IOException, handleAny,
3131
try)
32-
import Control.Lens ((^.))
32+
import Control.Lens (_Just, (&), (.~), (^.))
3333
import Control.Lens.Extras (is)
3434
import Control.Monad.Extra (allM, forM, forM_, forever,
3535
unless, void, when,
@@ -108,6 +108,22 @@ experiments =
108108
bench "hover" $ allWithIdentifierPos $ \DocumentPositions{..} ->
109109
isJust <$> getHover doc (fromJust identifierP),
110110
---------------------------------------------------------------------------------------
111+
bench "hover after edit" $ \docs -> do
112+
forM_ docs $ \DocumentPositions{..} ->
113+
changeDoc doc [charEdit stringLiteralP]
114+
flip allWithIdentifierPos docs $ \DocumentPositions{..} ->
115+
isJust <$> getHover doc (fromJust identifierP),
116+
---------------------------------------------------------------------------------------
117+
bench
118+
"hover after cradle edit"
119+
(\docs -> do
120+
hieYamlUri <- getDocUri "hie.yaml"
121+
liftIO $ appendFile (fromJust $ uriToFilePath hieYamlUri) "##\n"
122+
sendNotification SMethod_WorkspaceDidChangeWatchedFiles $ DidChangeWatchedFilesParams $
123+
[ FileEvent hieYamlUri FileChangeType_Changed ]
124+
flip allWithIdentifierPos docs $ \DocumentPositions{..} -> isJust <$> getHover doc (fromJust identifierP)
125+
),
126+
---------------------------------------------------------------------------------------
111127
bench "edit" $ \docs -> do
112128
forM_ docs $ \DocumentPositions{..} -> do
113129
changeDoc doc [charEdit stringLiteralP]
@@ -128,12 +144,6 @@ experiments =
128144
waitForProgressDone
129145
return True,
130146
---------------------------------------------------------------------------------------
131-
bench "hover after edit" $ \docs -> do
132-
forM_ docs $ \DocumentPositions{..} ->
133-
changeDoc doc [charEdit stringLiteralP]
134-
flip allWithIdentifierPos docs $ \DocumentPositions{..} ->
135-
isJust <$> getHover doc (fromJust identifierP),
136-
---------------------------------------------------------------------------------------
137147
bench "getDefinition" $ allWithIdentifierPos $ \DocumentPositions{..} ->
138148
hasDefinitions <$> getDefinitions doc (fromJust identifierP),
139149
---------------------------------------------------------------------------------------
@@ -162,30 +172,21 @@ experiments =
162172
flip allWithIdentifierPos docs $ \DocumentPositions{..} ->
163173
not . null <$> getCompletions doc (fromJust identifierP),
164174
---------------------------------------------------------------------------------------
165-
benchWithSetup
175+
bench
166176
"code actions"
167177
( \docs -> do
168178
unless (any (isJust . identifierP) docs) $
169179
error "None of the example modules is suitable for this experiment"
170-
forM_ docs $ \DocumentPositions{..} -> do
171-
forM_ identifierP $ \p -> changeDoc doc [charEdit p]
172-
waitForProgressStart
173-
waitForProgressDone
174-
)
175-
( \docs -> not . null . catMaybes <$> forM docs (\DocumentPositions{..} ->
176-
forM identifierP $ \p ->
177-
getCodeActions doc (Range p p))
180+
not . null . catMaybes <$> forM docs (\DocumentPositions{..} -> do
181+
forM identifierP $ \p ->
182+
getCodeActions doc (Range p p))
178183
),
179184
---------------------------------------------------------------------------------------
180-
benchWithSetup
185+
bench
181186
"code actions after edit"
182187
( \docs -> do
183188
unless (any (isJust . identifierP) docs) $
184189
error "None of the example modules is suitable for this experiment"
185-
forM_ docs $ \DocumentPositions{..} ->
186-
forM_ identifierP $ \p -> changeDoc doc [charEdit p]
187-
)
188-
( \docs -> do
189190
forM_ docs $ \DocumentPositions{..} -> do
190191
changeDoc doc [charEdit stringLiteralP]
191192
waitForProgressStart
@@ -195,15 +196,8 @@ experiments =
195196
getCodeActions doc (Range p p))
196197
),
197198
---------------------------------------------------------------------------------------
198-
benchWithSetup
199+
bench
199200
"code actions after cradle edit"
200-
( \docs -> do
201-
forM_ docs $ \DocumentPositions{..} -> do
202-
forM identifierP $ \p -> do
203-
changeDoc doc [charEdit p]
204-
waitForProgressStart
205-
void waitForBuildQueue
206-
)
207201
( \docs -> do
208202
hieYamlUri <- getDocUri "hie.yaml"
209203
liftIO $ appendFile (fromJust $ uriToFilePath hieYamlUri) "##\n"
@@ -219,13 +213,20 @@ experiments =
219213
),
220214
---------------------------------------------------------------------------------------
221215
bench
222-
"hover after cradle edit"
223-
(\docs -> do
224-
hieYamlUri <- getDocUri "hie.yaml"
225-
liftIO $ appendFile (fromJust $ uriToFilePath hieYamlUri) "##\n"
226-
sendNotification SMethod_WorkspaceDidChangeWatchedFiles $ DidChangeWatchedFilesParams $
227-
[ FileEvent hieYamlUri FileChangeType_Changed ]
228-
flip allWithIdentifierPos docs $ \DocumentPositions{..} -> isJust <$> getHover doc (fromJust identifierP)
216+
"code lens"
217+
( \docs -> not . null <$> forM docs (\DocumentPositions{..} ->
218+
getCodeLenses doc)
219+
),
220+
---------------------------------------------------------------------------------------
221+
bench
222+
"code lens after edit"
223+
( \docs -> do
224+
forM_ docs $ \DocumentPositions{..} -> do
225+
changeDoc doc [charEdit stringLiteralP]
226+
waitForProgressStart
227+
waitForProgressDone
228+
not . null <$> forM docs (\DocumentPositions{..} -> do
229+
getCodeLenses doc)
229230
),
230231
---------------------------------------------------------------------------------------
231232
benchWithSetup
@@ -483,7 +484,10 @@ runBenchmarksFun dir allBenchmarks = do
483484
]
484485
++ ["--ot-memory-profiling" | Just _ <- [otMemoryProfiling ?config]]
485486
lspTestCaps =
486-
fullCaps {_window = Just $ WindowClientCapabilities (Just True) Nothing Nothing }
487+
fullCaps
488+
& (L.window . _Just) .~ WindowClientCapabilities (Just True) Nothing Nothing
489+
& (L.textDocument . _Just . L.codeAction . _Just . L.resolveSupport . _Just) .~ (#properties .== ["edit"])
490+
& (L.textDocument . _Just . L.codeAction . _Just . L.dataSupport . _Just) .~ True
487491

488492
showMs :: Seconds -> String
489493
showMs = printf "%.2f"
@@ -512,7 +516,7 @@ waitForProgressStart :: Session ()
512516
waitForProgressStart = void $ do
513517
skipManyTill anyMessage $ satisfy $ \case
514518
FromServerMess SMethod_WindowWorkDoneProgressCreate _ -> True
515-
_ -> False
519+
_ -> False
516520

517521
-- | Wait for all progress to be done
518522
-- Needs at least one progress done notification to return
@@ -542,11 +546,9 @@ runBench ::
542546
(Session BenchRun -> IO BenchRun) ->
543547
Bench ->
544548
IO BenchRun
545-
runBench runSess b = handleAny (\e -> print e >> return badRun)
549+
runBench runSess Bench{..} = handleAny (\e -> print e >> return badRun)
546550
$ runSess
547551
$ do
548-
case b of
549-
Bench{..} -> do
550552
(startup, docs) <- duration $ do
551553
(d, docs) <- duration $ setupDocumentContents ?config
552554
output $ "Setting up document contents took " <> showDuration d

0 commit comments

Comments
 (0)