git.iko.soy/ghcide
on master help sign in
Fix VSCode extension and remove silly warnings (#2042)
906e5f8Moritz Kiefer
src/Development/IDE/LSP/Notifications.hs+7−8
compare with master
unifiedsplit
@@ -18,25 +18,24 @@ import Development.IDE.Types.Logger
18import Development.IDE.Core.Service
18import Development.IDE.Core.Service
19import Development.IDE.Types.Location
19import Development.IDE.Types.Location
20
20
21+import Control.Monad.Extra
21import qualified Data.Set as S
22import qualified Data.Set as S
22
23
23import Development.IDE.Core.FileStore
24import Development.IDE.Core.FileStore
24import Development.IDE.Core.OfInterest
25import Development.IDE.Core.OfInterest
25
26
26
27
27−whenUriFile :: IdeState -> Uri -> (NormalizedFilePath -> IO ()) -> IO ()
28+whenUriFile :: Uri -> (NormalizedFilePath -> IO ()) -> IO ()
28−whenUriFile ide uri act = case LSP.uriToFilePath uri of
29+whenUriFile uri act = whenJust (LSP.uriToFilePath uri) $ act . toNormalizedFilePath
29− Just file -> act $ toNormalizedFilePath file
30− Nothing -> logWarning (ideLogger ide) $ "Unknown scheme in URI: " <> getUri uri
31
30
32setHandlersNotifications :: PartialHandlers
31setHandlersNotifications :: PartialHandlers
33setHandlersNotifications = PartialHandlers $ \WithMessage{..} x -> return x
32setHandlersNotifications = PartialHandlers $ \WithMessage{..} x -> return x
34 {LSP.didOpenTextDocumentNotificationHandler = withNotification (LSP.didOpenTextDocumentNotificationHandler x) $
33 {LSP.didOpenTextDocumentNotificationHandler = withNotification (LSP.didOpenTextDocumentNotificationHandler x) $
35 \_ ide (DidOpenTextDocumentParams TextDocumentItem{_uri}) -> do
34 \_ ide (DidOpenTextDocumentParams TextDocumentItem{_uri}) -> do
36 setSomethingModified ide
35 setSomethingModified ide
37− whenUriFile ide _uri $ \file ->
36+ whenUriFile _uri $ \file -> do
38 modifyFilesOfInterest ide (S.insert file)
37 modifyFilesOfInterest ide (S.insert file)
39− logInfo (ideLogger ide) $ "Opened text document: " <> getUri _uri
38+ logInfo (ideLogger ide) $ "Opened text document: " <> getUri _uri
40
39
41 ,LSP.didChangeTextDocumentNotificationHandler = withNotification (LSP.didChangeTextDocumentNotificationHandler x) $
40 ,LSP.didChangeTextDocumentNotificationHandler = withNotification (LSP.didChangeTextDocumentNotificationHandler x) $
42 \_ ide (DidChangeTextDocumentParams VersionedTextDocumentIdentifier{_uri} _) -> do
41 \_ ide (DidChangeTextDocumentParams VersionedTextDocumentIdentifier{_uri} _) -> do
@@ -51,7 +50,7 @@ setHandlersNotifications = PartialHandlers $ \WithMessage{..} x -> return x
51 ,LSP.didCloseTextDocumentNotificationHandler = withNotification (LSP.didCloseTextDocumentNotificationHandler x) $
50 ,LSP.didCloseTextDocumentNotificationHandler = withNotification (LSP.didCloseTextDocumentNotificationHandler x) $
52 \_ ide (DidCloseTextDocumentParams TextDocumentIdentifier{_uri}) -> do
51 \_ ide (DidCloseTextDocumentParams TextDocumentIdentifier{_uri}) -> do
53 setSomethingModified ide
52 setSomethingModified ide
54− whenUriFile ide _uri $ \file ->
53+ whenUriFile _uri $ \file -> do
55 modifyFilesOfInterest ide (S.delete file)
54 modifyFilesOfInterest ide (S.delete file)
56− logInfo (ideLogger ide) $ "Closed text document: " <> getUri _uri
55+ logInfo (ideLogger ide) $ "Closed text document: " <> getUri _uri
57 }
56 }