Skip to content

Commit 795f25b

Browse files
committed
spec compliance: _registerOptions should be a Maybe
1 parent 596376a commit 795f25b

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lsp-test/src/Language/LSP/Test.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ createDoc file languageId contents = do
430430
createHits (WatchKind create _ _) = create
431431

432432
regHits :: Registration WorkspaceDidChangeWatchedFiles -> Bool
433-
regHits reg = foldl' (\acc w -> acc || watchHits w) False (reg ^. registerOptions . watchers)
433+
regHits reg = foldl' (\acc w -> acc || watchHits w) False (reg ^. registerOptions . _Just . watchers)
434434

435435
clientCapsSupports =
436436
caps ^? workspace . _Just . didChangeWatchedFiles . _Just . dynamicRegistration . _Just

lsp-types/src/Language/LSP/Types/Registration.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ data Registration (m :: Method FromClient t) =
111111
, _method :: SClientMethod m
112112
-- | Options necessary for the registration.
113113
-- Make this strict to aid the pattern matching exhaustiveness checker
114-
, _registerOptions :: !(RegistrationOptions m)
114+
, _registerOptions :: !(Maybe (RegistrationOptions m))
115115
}
116116
deriving Generic
117117

lsp/src/Language/LSP/Server/Core.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ registerCapability method regOpts f = do
503503
-- First, check to see if the client supports dynamic registration on this method
504504
| dynamicSupported clientCaps = do
505505
uuid <- liftIO $ UUID.toText <$> getStdRandom random
506-
let registration = J.Registration uuid method regOpts
506+
let registration = J.Registration uuid method (Just regOpts)
507507
params = J.RegistrationParams (J.List [J.SomeRegistration registration])
508508
regId = RegistrationId uuid
509509
rio <- askUnliftIO

0 commit comments

Comments
 (0)