Use TypeInType for GHC 8.4.4 builds

diff --git a/cabal.project b/cabal.project
index 07e67eee28ef1c7460451b099cd7c81a80b24cef..abe09051548a2752baf81e24c78fc938775004b2 100644 (file)
--- a/cabal.project
+++ b/cabal.project
@@ -7,6 +7,6 @@ haddock-quickjump: True
 source-repository-package
     type: git
     location: https://github.com/alanz/lsp.git
-    tag: 7577be56392862abe880e0099ea9834a1012a34f
+    tag: e0ed7c79f9bd019b06b5fecfc558adcc2b1318a7
     subdir: .
             lsp-types

diff --git a/src/Language/LSP/Test.hs b/src/Language/LSP/Test.hs
index 9d7c020c1bc487344468067d6dce581310389855..40215471600e1e7e7d47887d85251f8b477ebc75 100644 (file)
--- a/src/Language/LSP/Test.hs
+++ b/src/Language/LSP/Test.hs
@@ -2,10 +2,9 @@
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE KindSignatures #-}
-{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE PolyKinds #-}
+{-# LANGUAGE TypeInType #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE ExistentialQuantification #-}
 

diff --git a/src/Language/LSP/Test/Decoding.hs b/src/Language/LSP/Test/Decoding.hs
index 78337a1d57bc65b0c5d188ee7faf8a524a2b4be0..eac3f394338ef25a121155ee21784b65a8ac3e32 100644 (file)
--- a/src/Language/LSP/Test/Decoding.hs
+++ b/src/Language/LSP/Test/Decoding.hs
@@ -1,9 +1,8 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE GADTs #-}
-{-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE KindSignatures #-}
-{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeInType #-}
 module Language.LSP.Test.Decoding where
 
 import           Prelude                 hiding ( id )

diff --git a/src/Language/LSP/Test/Parsing.hs b/src/Language/LSP/Test/Parsing.hs
index 26625b555111bbf554643baf3ad18690a632f17b..95937c51c11fca122f8d0bafd7735a38f64169c0 100644 (file)
--- a/src/Language/LSP/Test/Parsing.hs
+++ b/src/Language/LSP/Test/Parsing.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE EmptyCase #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE PolyKinds #-}
+{-# LANGUAGE TypeInType #-}
 {-# LANGUAGE KindSignatures #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GADTs #-}

diff --git a/test/dummy-server/Main.hs b/test/dummy-server/Main.hs
index 1af140ef5ad0fe7a78f9e1182b8e2a864800dfef..7c73e3b019ecb676583410b1efd1e78a153d1ccb 100644 (file)
--- a/test/dummy-server/Main.hs
+++ b/test/dummy-server/Main.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE TypeInType #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 import Control.Monad