From c8c5b6541a512c4fc32b28b10ecc10727723a567 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Wed, 10 Apr 2019 21:44:50 +0100 Subject: [PATCH 1/2] Revert "Enable TypeDefinition Requests" This reverts commit b80fe73a696e9b6cd543227b4035308df7170738. --- src/Haskell/Ide/Engine/Transport/LspStdio.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Haskell/Ide/Engine/Transport/LspStdio.hs b/src/Haskell/Ide/Engine/Transport/LspStdio.hs index 6c4eb8974..062c9d390 100644 --- a/src/Haskell/Ide/Engine/Transport/LspStdio.hs +++ b/src/Haskell/Ide/Engine/Transport/LspStdio.hs @@ -965,7 +965,6 @@ hieOptions :: [T.Text] -> Core.Options hieOptions commandIds = def { Core.textDocumentSync = Just syncOptions , Core.completionProvider = Just (J.CompletionOptions (Just True) (Just ["."])) - , Core.typeDefinitionProvider = Just (J.GotoOptionsStatic True) -- As of 2018-05-24, vscode needs the commands to be registered -- otherwise they will not be available as codeActions (will be -- silently ignored, despite UI showing to the contrary). From 8cd2ddb08e9c06f60a8ae6f1456a2a7902d0a499 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Thu, 11 Apr 2019 21:42:49 +0100 Subject: [PATCH 2/2] Update haskell-lsp --- haskell-ide-engine.cabal | 3 ++- stack-8.2.1.yaml | 4 ++-- stack-8.2.2.yaml | 4 ++-- stack-8.4.2.yaml | 4 ++-- stack-8.4.3.yaml | 4 ++-- stack-8.4.4.yaml | 4 ++-- stack-8.6.1.yaml | 4 ++-- stack-8.6.2.yaml | 3 ++- stack-8.6.3.yaml | 3 ++- stack-8.6.4.yaml | 2 ++ stack.yaml | 2 ++ 11 files changed, 22 insertions(+), 15 deletions(-) diff --git a/haskell-ide-engine.cabal b/haskell-ide-engine.cabal index e116c9c72..19d5d95e0 100644 --- a/haskell-ide-engine.cabal +++ b/haskell-ide-engine.cabal @@ -70,7 +70,8 @@ library , gitrev >= 1.1 , haddock-api , haddock-library - , haskell-lsp >= 0.8 + , haskell-lsp >= 0.8.2 + , haskell-lsp-types >= 0.8.2 , haskell-src-exts , hie-plugin-api , hlint >= 2.0.11 diff --git a/stack-8.2.1.yaml b/stack-8.2.1.yaml index 8a4d2377c..b56ed5da3 100644 --- a/stack-8.2.1.yaml +++ b/stack-8.2.1.yaml @@ -19,8 +19,8 @@ extra-deps: - ghc-exactprint-0.5.8.2 - haddock-api-2.18.1 - haddock-library-1.4.4 -- haskell-lsp-0.8.1.0 -- haskell-lsp-types-0.8.0.1 +- haskell-lsp-0.8.2.0 +- haskell-lsp-types-0.8.2.0 - hlint-2.0.11 - hsimport-0.8.6 - lsp-test-0.5.1.0 diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml index de309f9a5..0acb0a1b0 100644 --- a/stack-8.2.2.yaml +++ b/stack-8.2.2.yaml @@ -20,8 +20,8 @@ extra-deps: - ghc-exactprint-0.5.8.2 - haddock-api-2.18.1 - haddock-library-1.4.4 -- haskell-lsp-0.8.1.0 -- haskell-lsp-types-0.8.0.1 +- haskell-lsp-0.8.2.0 +- haskell-lsp-types-0.8.2.0 - haskell-src-exts-1.21.0 - hlint-2.1.15 - hoogle-5.0.17.5 diff --git a/stack-8.4.2.yaml b/stack-8.4.2.yaml index ebf88652c..da6ea01e8 100644 --- a/stack-8.4.2.yaml +++ b/stack-8.4.2.yaml @@ -18,8 +18,8 @@ extra-deps: - ghc-exactprint-0.5.8.2 - haddock-api-2.20.0 - haddock-library-1.6.0 -- haskell-lsp-0.8.1.0 -- haskell-lsp-types-0.8.0.1 +- haskell-lsp-0.8.2.0 +- haskell-lsp-types-0.8.2.0 - haskell-src-exts-1.21.0 - hlint-2.1.15 - hoogle-5.0.17.5 diff --git a/stack-8.4.3.yaml b/stack-8.4.3.yaml index 37d1afc45..f728078f7 100644 --- a/stack-8.4.3.yaml +++ b/stack-8.4.3.yaml @@ -17,8 +17,8 @@ extra-deps: - ghc-exactprint-0.5.8.2 - haddock-api-2.20.0 - haddock-library-1.6.0 -- haskell-lsp-0.8.1.0 -- haskell-lsp-types-0.8.0.1 +- haskell-lsp-0.8.2.0 +- haskell-lsp-types-0.8.2.0 - haskell-src-exts-1.21.0 - hlint-2.1.15 - hoogle-5.0.17.5 diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml index cb41a4926..1f14d5c7f 100644 --- a/stack-8.4.4.yaml +++ b/stack-8.4.4.yaml @@ -17,8 +17,8 @@ extra-deps: - ghc-exactprint-0.5.8.2 - haddock-api-2.20.0 - haddock-library-1.6.0 -- haskell-lsp-0.8.1.0 -- haskell-lsp-types-0.8.0.1 +- haskell-lsp-0.8.2.0 +- haskell-lsp-types-0.8.2.0 - haskell-src-exts-1.21.0 - hlint-2.1.15 - hoogle-5.0.17.5 diff --git a/stack-8.6.1.yaml b/stack-8.6.1.yaml index 9fca2af6f..7ba4530ce 100644 --- a/stack-8.6.1.yaml +++ b/stack-8.6.1.yaml @@ -19,8 +19,8 @@ extra-deps: - czipwith-1.0.1.1 - data-tree-print-0.1.0.2 - haddock-api-2.21.0 -- haskell-lsp-0.8.1.0 -- haskell-lsp-types-0.8.0.1 +- haskell-lsp-0.8.2.0 +- haskell-lsp-types-0.8.2.0 - haskell-src-exts-1.21.0 - hlint-2.1.15 - hoogle-5.0.17.5 diff --git a/stack-8.6.2.yaml b/stack-8.6.2.yaml index 1f8fac53f..9ecacf3a5 100644 --- a/stack-8.6.2.yaml +++ b/stack-8.6.2.yaml @@ -16,7 +16,8 @@ extra-deps: - constrained-dynamic-0.1.0.0 - haddock-api-2.21.0 - haskell-src-exts-1.21.0 -- haskell-lsp-0.8.1.0 +- haskell-lsp-0.8.2.0 +- haskell-lsp-types-0.8.2.0 - hlint-2.1.15 - hoogle-5.0.17.5 - hsimport-0.8.8 diff --git a/stack-8.6.3.yaml b/stack-8.6.3.yaml index 2b1faaea4..1fcda668f 100644 --- a/stack-8.6.3.yaml +++ b/stack-8.6.3.yaml @@ -16,7 +16,8 @@ extra-deps: - constrained-dynamic-0.1.0.0 - haddock-api-2.21.0 - haskell-src-exts-1.21.0 -- haskell-lsp-0.8.1.0 +- haskell-lsp-0.8.2.0 +- haskell-lsp-types-0.8.2.0 - hlint-2.1.15 - hoogle-5.0.17.5 - hsimport-0.8.8 diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 1573197c9..67f3f84a5 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -16,6 +16,8 @@ extra-deps: - constrained-dynamic-0.1.0.0 - haddock-api-2.22.0 - haskell-src-exts-1.21.0 +- haskell-lsp-0.8.2.0 +- haskell-lsp-types-0.8.2.0 - hlint-2.1.15 - hsimport-0.8.8 - hoogle-5.0.17.6 diff --git a/stack.yaml b/stack.yaml index dc9d50e4e..b45e8a2bc 100644 --- a/stack.yaml +++ b/stack.yaml @@ -18,6 +18,8 @@ extra-deps: - deque-0.2.7 - ghc-exactprint-0.5.8.2 - haddock-api-2.22.0 +- haskell-lsp-0.8.2.0 +- haskell-lsp-types-0.8.2.0 - hlint-2.1.15 - hsimport-0.8.8 - lsp-test-0.5.1.0