Merge branch 'master' into tdr-test-impls

diff --git a/.travis.yml b/.travis.yml
index 494ec7d0d846c9c36afe904b378402b563402f26..c1cf11beaad342911054bcdd2adf88fb9ec4659f 100644 (file)
--- 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 0fc2f53f73d2511b480a83b7ef770e83ba9acba9..09f8b341b27d5c89fe57e2213c81b6f6b726dbb0 100644 (file)
--- 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