Bump ghcide (digital-asset#3865)

* Bump ghcide * Fix goto definition tests * Fix hie-bios config * Try to fix windows
FlashSheridan · Dec 17, 2019 · c65f918 · c65f918
1 parent 6d83a7b
commit c65f918
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/.hie-bios b/.hie-bios
@@ -1,2 +1,2 @@
 #!/bin/sh
-cat "$HIE_BIOS_ARGS" | sed "s/'//g" | sed "s/-qg//g" | sed "s/+RTS.*-RTS//" | sed "s|/bazel-out|bazel-out|g" | sed "s/-fexternal-interpreter//g"
+cat "$HIE_BIOS_ARGS" | sed "s/'//g" | sed "s/-qg//g" | sed "s/+RTS.*-RTS//" | sed "s|/bazel-out|bazel-out|g" | sed "s/-fexternal-interpreter//g" | tr " " "\n" > "$HIE_BIOS_OUTPUT"
diff --git a/bazel-haskell-deps.bzl b/bazel-haskell-deps.bzl
@@ -17,9 +17,9 @@ load("@os_info//:os_info.bzl", "is_windows")
 load("@dadew//:dadew.bzl", "dadew_tool_home")
 load("@rules_haskell//haskell:cabal.bzl", "stack_snapshot")
 
-GHCIDE_REV = "b5b80d91f912ffa2b3ff0ad4e10bcec6c728f601"
-GHCIDE_SHA256 = "771bfc3b9c9cd2bbe7edd29d95fdd17b0f6cec12a3cb01dd7503f2a2bc751a32"
-GHCIDE_VERSION = "0.0.4"
+GHCIDE_REV = "ef8de2e7fc55c6f246a9ff322ed3637a7bb71c20"
+GHCIDE_SHA256 = "55f4ab090144428471e07e746a4688e35f32460f227c0b9e009450a354076592"
+GHCIDE_VERSION = "0.0.5"
 
 def daml_haskell_deps():
     """Load all Haskell dependencies of the DAML repository."""

diff --git a/compiler/damlc/tests/src/DA/Test/ShakeIdeClient.hs b/compiler/damlc/tests/src/DA/Test/ShakeIdeClient.hs
@@ -584,8 +584,7 @@ goToDefinitionTests mbScenarioService = Tasty.testGroup "Go to definition tests"
             expectGoToDefinition (foo,2,[2..4]) Missing             -- " : "
             expectGoToDefinition (foo,2,[9])    Missing             -- "\n"
             expectGoToDefinition (foo,2,[10])   Missing             -- (out of range)
-            expectGoToDefinition (foo,3,[0..2]) (At (foo,3,0))      -- "foo"
-            expectGoToDefinition (foo,3,[3..5])  Missing             -- " = "
+            expectGoToDefinition (foo,3,[0..5]) (At (foo,3,0))      -- "foo = "
             expectGoToDefinition (foo,3,[6..8]) (At (foo,5,0))      -- "bar"
             expectGoToDefinition (foo,3,[9])    Missing             -- "\n"
             expectGoToDefinition (foo,3,[10])   Missing             -- (out of range)
@@ -645,13 +644,11 @@ goToDefinitionTests mbScenarioService = Tasty.testGroup "Go to definition tests"
                 , "baz = 10"
                 ]
             setFilesOfInterest [foo]
-            expectGoToDefinition (foo,2,[0..2]) (At (foo,2,0))
-            expectGoToDefinition (foo,2,[3..5]) Missing
+            expectGoToDefinition (foo,2,[0..5]) (At (foo,2,0))
             expectGoToDefinition (foo,2,[6..8]) (At (foo,3,0))
             expectGoToDefinition (foo,2,[9]) Missing
 
-            expectGoToDefinition (foo,3,[0..2]) (At (foo,3,0))
-            expectGoToDefinition (foo,3,[3]) Missing
+            expectGoToDefinition (foo,3,[0..3]) (At (foo,3,0))
             expectGoToDefinition (foo,3,[4..6]) (At (foo,4,0))
             expectGoToDefinition (foo,3,[7]) Missing
 

diff --git a/stack-snapshot.yaml b/stack-snapshot.yaml
@@ -11,11 +11,11 @@ packages:
   - extra-1.6.18
   - grpc-haskell-0.0.1.0
   - grpc-haskell-core-0.0.0.0
-  - haskell-lsp-0.18.0.0
-  - haskell-lsp-types-0.18.0.0
-  - hie-bios-0.2.1
+  - haskell-lsp-0.19.0.0
+  - haskell-lsp-types-0.19.0.0
+  - hie-bios-0.3.0
   - hpp-0.6.1
-  - lsp-test-0.8.2.0
+  - lsp-test-0.9.0.0
   - proto3-suite-0.4.0.0
   - proto3-wire-1.1.0
   # Core packages, need to be listed for integer-simple flags.