From d7e1ea01248d557b3c5e96d8edb9d6254ad094e4 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Thu, 14 May 2020 20:51:09 +0100 Subject: [PATCH] Try to make dummy server platform agnostic --- test/Test.hs | 8 ++++---- test/dummy-server/Main.hs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/Test.hs b/test/Test.hs index fe599e7..c4aae07 100644 --- a/test/Test.hs +++ b/test/Test.hs @@ -333,7 +333,7 @@ main = findServer >>= \serverExe -> hspec $ do it "keeps track" $ runSession serverExe fullCaps "test/data" $ do loggingNotification -- initialized log message - createDoc "register" "haskell" "" + createDoc ".register" "haskell" "" message :: Session RegisterCapabilityRequest doc <- createDoc "Foo.watch" "haskell" "" @@ -348,7 +348,7 @@ main = findServer >>= \serverExe -> hspec $ do ] -- now unregister it by sending a specific createDoc - createDoc "unregister" "haskell" "" + createDoc ".unregister" "haskell" "" message :: Session UnregisterCapabilityRequest createDoc "Bar.watch" "haskell" "" @@ -361,7 +361,7 @@ main = findServer >>= \serverExe -> hspec $ do loggingNotification -- initialized log message - createDoc "register.abs" "haskell" "" + createDoc ".register.abs" "haskell" "" message :: Session RegisterCapabilityRequest doc <- createDoc (curDir "Foo.watch") "haskell" "" @@ -369,7 +369,7 @@ main = findServer >>= \serverExe -> hspec $ do liftIO $ msg ^. params . LSP.message `shouldBe` "got workspace/didChangeWatchedFiles" -- now unregister it by sending a specific createDoc - createDoc "unregister.abs" "haskell" "" + createDoc ".unregister.abs" "haskell" "" message :: Session UnregisterCapabilityRequest createDoc (curDir "Bar.watch") "haskell" "" diff --git a/test/dummy-server/Main.hs b/test/dummy-server/Main.hs index 8120b03..aa73677 100644 --- a/test/dummy-server/Main.hs +++ b/test/dummy-server/Main.hs @@ -59,7 +59,7 @@ handlers lfvar = def fmServerPublishDiagnosticsNotification $ PublishDiagnosticsParams uri $ List [diag] -- also act as a registerer for workspace/didChangeWatchedFiles - when ("/register" `isSuffixOf` fp) $ do + when (".register" `isSuffixOf` fp) $ do reqId <- readMVar lfvar >>= getNextReqId send $ ReqRegisterCapability $ fmServerRegisterCapabilityRequest reqId $ RegistrationParams $ List $ @@ -67,7 +67,7 @@ handlers lfvar = def DidChangeWatchedFilesRegistrationOptions $ List [ FileSystemWatcher "*.watch" (Just (WatchKind True True True)) ] ] - when ("/register.abs" `isSuffixOf` fp) $ do + when (".register.abs" `isSuffixOf` fp) $ do curDir <- getCurrentDirectory reqId <- readMVar lfvar >>= getNextReqId send $ ReqRegisterCapability $ fmServerRegisterCapabilityRequest reqId $ @@ -78,11 +78,11 @@ handlers lfvar = def ] -- also act as an unregisterer for workspace/didChangeWatchedFiles - when ("/unregister" `isSuffixOf` fp) $ do + when (".unregister" `isSuffixOf` fp) $ do reqId <- readMVar lfvar >>= getNextReqId send $ ReqUnregisterCapability $ fmServerUnregisterCapabilityRequest reqId $ UnregistrationParams $ List [ Unregistration "0" "workspace/didChangeWatchedFiles" ] - when ("/unregister.abs" `isSuffixOf` fp) $ do + when (".unregister.abs" `isSuffixOf` fp) $ do reqId <- readMVar lfvar >>= getNextReqId send $ ReqUnregisterCapability $ fmServerUnregisterCapabilityRequest reqId $ UnregistrationParams $ List [ Unregistration "1" "workspace/didChangeWatchedFiles" ] -- 2.30.2