From: Luke Lau <luke_lau@icloud.com>
Date: Sat, 20 Apr 2019 21:37:05 +0000 (+0100)
Subject: Merge branch 'master' into tdr-test-impls
X-Git-Tag: 0.5.3.0~5^2~1
X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=2a96b8057517343244d3e716de0938dc4e6d7955;hp=5cc69357da694c5521a78b0ab64866d76993de65

Merge branch 'master' into tdr-test-impls
---

diff --git a/.travis.yml b/.travis.yml
index 494ec7d..c1cf11b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ before_install:
   - git init
   - git remote add origin https://github.com/haskell/haskell-ide-engine.git
   - git pull origin master
-  - git checkout 4c64789597cec9e73c9aeb901d9f6d0bb58251d9
+  - git checkout 47b5281d9d8ffe7348f7f7fcb3ce36b4eabd4f06
   - git submodule init
   - git submodule sync
   - git submodule update --init
diff --git a/test/Test.hs b/test/Test.hs
index 0fc2f53..09f8b34 100644
--- a/test/Test.hs
+++ b/test/Test.hs
@@ -259,12 +259,12 @@ main = hspec $ do
       defs <- getDefinitions doc pos
       liftIO $ defs `shouldBe` [Location (doc ^. uri) (mkRange 28 0 28 7)]
 
-  -- describe "getTypeDefinitions" $
-  --   it "works" $ runSession "hie" fullCaps "test/data/renamePass" $ do
-  --     doc <- openDoc "Desktop/simple.hs" "haskell"
-  --     let pos = Position 20 23  -- Quit value
-  --     defs <- getTypeDefinitions doc pos
-  --     liftIO $ defs `shouldBe` [Location (doc ^. uri) (mkRange 10 5 10 12)]  -- Type definition
+  describe "getTypeDefinitions" $
+    it "works" $ runSession "hie" fullCaps "test/data/renamePass" $ do
+      doc <- openDoc "Desktop/simple.hs" "haskell"
+      let pos = Position 20 23  -- Quit value
+      defs <- getTypeDefinitions doc pos
+      liftIO $ defs `shouldBe` [Location (doc ^. uri) (mkRange 10 0 15 19)]  -- Type definition
 
   describe "waitForDiagnosticsSource" $
     it "works" $ runSession "hie" fullCaps "test/data" $ do