X-Git-Url: https://git.lukelau.me/?a=blobdiff_plain;f=src%2FLanguage%2FHaskell%2FLSP%2FTest.hs;h=3ad7b2f042b34d3a3fd4f18530fbc256ac8e9b7c;hb=5de316d1457c8abfac4c41c2a86892b74a1db07c;hp=03e2a1a55e13f4c32996c2305acf8e328ea6f3ec;hpb=3a38253a1fcd83c83b05fbfbf132d1ead842b0a7;p=lsp-test.git diff --git a/src/Language/Haskell/LSP/Test.hs b/src/Language/Haskell/LSP/Test.hs index 03e2a1a..3ad7b2f 100644 --- a/src/Language/Haskell/LSP/Test.hs +++ b/src/Language/Haskell/LSP/Test.hs @@ -114,7 +114,6 @@ import System.Environment import System.IO import System.Directory import System.FilePath -import qualified Data.Rope.UTF16 as Rope -- | Starts a new session. -- @@ -195,14 +194,16 @@ runSessionWithConfig config' serverExe caps rootDir session = do logStdErr' <- fromMaybe (logStdErr cfg) <$> checkEnv "LSP_TEST_LOG_STDERR" return $ cfg { logMessages = logMessages', logStdErr = logStdErr' } where checkEnv :: String -> IO (Maybe Bool) - checkEnv s = fmap (const True) <$> lookupEnv s + checkEnv s = fmap convertVal <$> lookupEnv s + convertVal "0" = False + convertVal _ = True -- | The current text contents of a document. documentContents :: TextDocumentIdentifier -> Session T.Text documentContents doc = do vfs <- vfs <$> get let file = vfsMap vfs Map.! toNormalizedUri (doc ^. uri) - return $ Rope.toText $ Language.Haskell.LSP.VFS._text file + return (virtualFileText file) -- | Parses an ApplyEditRequest, checks that it is for the passed document -- and returns the new content