From d109e54344188ecdcd2cd1fb87a6e475331875bb Mon Sep 17 00:00:00 2001 From: Zubin Duggal Date: Wed, 3 Mar 2021 20:16:08 +0530 Subject: [PATCH] Revert all changes to hie-compat since 11b5c2e --- ghcide/ghcide.cabal | 2 +- hie-compat/hie-compat.cabal | 2 +- hie-compat/src-ghc86/Compat/HieDebug.hs | 1 + hie-compat/src-ghc86/Compat/HieTypes.hs | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index b8b965d3a9..c9d36ae806 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -57,7 +57,7 @@ library Glob, haddock-library >= 1.8, hashable, - hie-compat ^>= 1.0.0.0, + hie-compat ^>= 0.1.0.0, hls-plugin-api ^>= 1.0.0.0, lens, hiedb == 0.3.0.1, diff --git a/hie-compat/hie-compat.cabal b/hie-compat/hie-compat.cabal index 129a16b908..9778485028 100644 --- a/hie-compat/hie-compat.cabal +++ b/hie-compat/hie-compat.cabal @@ -1,6 +1,6 @@ cabal-version: 1.22 name: hie-compat -version: 1.0.0.0 +version: 0.1.0.0 synopsis: HIE files for GHC 8.6 and other HIE file backports license: Apache-2.0 description: diff --git a/hie-compat/src-ghc86/Compat/HieDebug.hs b/hie-compat/src-ghc86/Compat/HieDebug.hs index 06a2cd0924..c3df58f2f8 100644 --- a/hie-compat/src-ghc86/Compat/HieDebug.hs +++ b/hie-compat/src-ghc86/Compat/HieDebug.hs @@ -1,6 +1,7 @@ {- Functions to validate and check .hie file ASTs generated by GHC. -} +{-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE FlexibleContexts #-} module Compat.HieDebug where diff --git a/hie-compat/src-ghc86/Compat/HieTypes.hs b/hie-compat/src-ghc86/Compat/HieTypes.hs index b9dfa1ccb1..d17ec9a521 100644 --- a/hie-compat/src-ghc86/Compat/HieTypes.hs +++ b/hie-compat/src-ghc86/Compat/HieTypes.hs @@ -5,6 +5,7 @@ For more information see https://gitlab.haskell.org/ghc/ghc/wikis/hie-files -} {-# LANGUAGE DeriveTraversable #-} {-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE TypeSynonymInstances #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE ScopedTypeVariables #-} {-# OPTIONS_GHC -Wno-orphans #-}