From 23b1dcf20f37869d29158ebc38402503894bcd80 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Fri, 7 Aug 2020 12:24:02 +0100 Subject: [PATCH] Start off on new version in didChanges from updateState When updateState processes a ReqApplyWorkspaceEdit and sends out didChange notifications, send the first edit from a new version, i.e. current version + 1, not the current version as was previously. --- Setup.hs | 2 -- cabal.project | 2 +- lsp-test.cabal | 2 +- src/Language/Haskell/LSP/Test/Session.hs | 2 +- stack.yaml | 6 ------ 5 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 Setup.hs delete mode 100644 stack.yaml diff --git a/Setup.hs b/Setup.hs deleted file mode 100644 index 9a994af..0000000 --- a/Setup.hs +++ /dev/null @@ -1,2 +0,0 @@ -import Distribution.Simple -main = defaultMain diff --git a/cabal.project b/cabal.project index b34b4f6..543e44f 100644 --- a/cabal.project +++ b/cabal.project @@ -1,4 +1,4 @@ packages: . flags: +DummyServer test-show-details: direct - +haddock-quickjump: True diff --git a/lsp-test.cabal b/lsp-test.cabal index 25154d0..922391a 100644 --- a/lsp-test.cabal +++ b/lsp-test.cabal @@ -1,5 +1,5 @@ name: lsp-test -version: 0.11.0.3 +version: 0.11.0.4 synopsis: Functional test framework for LSP servers. description: A test framework for writing tests against diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs index 4b1793f..4b93e71 100644 --- a/src/Language/Haskell/LSP/Test/Session.hs +++ b/src/Language/Haskell/LSP/Test/Session.hs @@ -369,7 +369,7 @@ updateState (ReqApplyWorkspaceEdit r) = do m <- vfsMap . vfs <$> get let curVer = fromMaybe 0 $ _lsp_version <$> m Map.!? (toNormalizedUri uri) - pure $ map (VersionedTextDocumentIdentifier uri . Just) [curVer..] + pure $ map (VersionedTextDocumentIdentifier uri . Just) [curVer + 1..] textDocumentEdits uri edits = do vers <- textDocumentVersions uri diff --git a/stack.yaml b/stack.yaml deleted file mode 100644 index fccc526..0000000 --- a/stack.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resolver: lts-15.11 -packages: - - . -extra-deps: - - haskell-lsp-0.22.0.0@sha256:636af17378c10db3c784df697f1a0a450c694f1cf4a88acd0ed58be90c5295ec,5315 - - haskell-lsp-types-0.22.0.0@sha256:c0fcd9c89279d92e79fce8e928553fa184645d0a0286a6736dec773d447510e9,3027 -- 2.30.2