Refinement holes

haskell · Sep 2, 2020 · 7790be9 · 7790be9
1 parent d4f6b91
commit 7790be9
Show file tree

Hide file tree

Showing 5 changed files with 121 additions and 74 deletions.
diff --git a/ghcide.cabal b/ghcide.cabal
@@ -101,6 +101,7 @@ library
         BangPatterns
         DeriveFunctor
         DeriveGeneric
+        FlexibleContexts
         GeneralizedNewtypeDeriving
         LambdaCase
         NamedFieldPuns
@@ -221,6 +222,7 @@ benchmark benchHist
         BangPatterns
         DeriveFunctor
         DeriveGeneric
+        FlexibleContexts
         GeneralizedNewtypeDeriving
         LambdaCase
         NamedFieldPuns
@@ -285,6 +287,7 @@ executable ghcide
         BangPatterns
         DeriveFunctor
         DeriveGeneric
+        FlexibleContexts
         GeneralizedNewtypeDeriving
         LambdaCase
         NamedFieldPuns
@@ -355,6 +358,7 @@ test-suite ghcide-tests
         BangPatterns
         DeriveFunctor
         DeriveGeneric
+        FlexibleContexts
         GeneralizedNewtypeDeriving
         LambdaCase
         NamedFieldPuns
@@ -393,6 +397,7 @@ executable ghcide-bench
         BangPatterns
         DeriveFunctor
         DeriveGeneric
+        FlexibleContexts
         GeneralizedNewtypeDeriving
         LambdaCase
         NamedFieldPuns

diff --git a/session-loader/Development/IDE/Session.hs b/session-loader/Development/IDE/Session.hs
@@ -32,6 +32,7 @@ import Data.Time.Clock
 import Data.Version
 import Development.IDE.Core.OfInterest
 import Development.IDE.Core.Shake
+import Development.IDE.GHC.Compat
 import Development.IDE.GHC.Util
 import Development.IDE.Session.VersionCheck
 import Development.IDE.Types.Diagnostics
@@ -51,7 +52,6 @@ import System.FilePath
 import System.Info
 import System.IO
 
-import GHC
 import DynFlags
 import HscTypes
 import Linker
@@ -531,6 +531,7 @@ setOptions (ComponentOptions theOpts compRoot _) dflags = do
           setIgnoreInterfacePragmas $
           setLinkerOptions $
           disableOptimisation $
+          setUpTypedHoles $
           makeDynFlagsAbsolute compRoot dflags'
     -- initPackages parses the -package flags and
     -- sets up the visibility for each component.

diff --git a/src/Development/IDE/GHC/Compat.hs b/src/Development/IDE/GHC/Compat.hs
@@ -30,6 +30,7 @@ module Development.IDE.GHC.Compat(
     addIncludePathsQuote,
     getModuleHash,
     getPackageName,
+    setUpTypedHoles,
     pattern DerivD,
     pattern ForD,
     pattern InstD,
@@ -300,6 +301,14 @@ dontWriteHieFiles d =
     d
 #endif
 
+setUpTypedHoles ::DynFlags -> DynFlags
+setUpTypedHoles df
+  = df
+#if MIN_GHC_API_VERSION(8,6,0)
+  { refLevelHoleFits = Just 2  -- GHC diagnostics become too slow for level > 2
+  }
+#endif
+
 nameListFromAvails :: [AvailInfo] -> [(SrcSpan, Name)]
 nameListFromAvails as =
   map (\n -> (nameSrcSpan n, n)) (concatMap availNames as)