NoExt and less dependency on ghc

Author: isovector

plugins/default/src/Ide/LocalBindings.hs

@@ -21,7 +21,7 @@ import           Data.Maybe
 import           Data.Ord
 import           Data.Set (Set)
 import qualified Data.Set as S
-import           Development.IDE.GHC.Compat (TypecheckedModule (..), GhcTc, NoExt (..), RefMap, identType)
+import           Development.IDE.GHC.Compat (TypecheckedModule (..), GhcTc, noExt, RefMap, identType)
 import           HsBinds
 import           HsExpr
 import           Id
@@ -208,7 +208,7 @@ holify (Bindings _ local) v@(L span (HsVar _ (L _ var))) =
           -- Make sure the binding is not in scope and that it begins with an
           -- underscore
           case not (S.member var binds) && take 1 (occNameString occ) == "_" of
-            True  -> L span $ HsUnboundVar NoExt $ TrueExprHole occ
+            True  -> L span $ HsUnboundVar noExt $ TrueExprHole occ
             False -> v
 holify _ v = v
 

plugins/default/src/Ide/Plugin/Tactic/Machinery.hs

@@ -38,7 +38,7 @@ import           TysWiredIn (listTyCon, pairTyCon, intTyCon, floatTyCon, doubleT
 ------------------------------------------------------------------------------
 -- | Orphan instance for producing holes when attempting to solve tactics.
 instance MonadExtract (LHsExpr GhcPs) ProvableM where
-  hole = pure $ noLoc $ HsVar NoExt $ noLoc $ Unqual $ mkVarOcc "_"
+  hole = pure $ noLoc $ HsVar noExt $ noLoc $ Unqual $ mkVarOcc "_"
 
 
 ------------------------------------------------------------------------------
@@ -239,7 +239,7 @@ buildDataCon hy dc apps = do
   pure
     . noLoc
     . foldl' (@@)
-        (HsVar NoExt $ noLoc $ Unqual $ nameOccName $ dataConName dc)
+        (HsVar noExt $ noLoc $ Unqual $ nameOccName $ dataConName dc)
     $ fmap unLoc sgs
 
 

plugins/default/src/Ide/Plugin/Tactic/Tactics.hs

@@ -25,9 +25,14 @@ import           Name
 import           Refinery.Tactic
 import           TcType
 import           TyCoRep
-import           Type
+import           Type hiding (Var)
 
 
+------------------------------------------------------------------------------
+-- | Like 'var', but works over standard GHC 'OccName's.
+var' :: Var a => OccName -> a
+var' = var . fromString . occNameString
+
 ------------------------------------------------------------------------------
 -- | Like 'bvar', but works over standard GHC 'OccName's.
 bvar' :: BVar a => OccName -> a
@@ -39,7 +44,7 @@ bvar' = bvar . fromString . occNameString
 assumption :: TacticsM ()
 assumption = rule $ \(Judgement hy g) ->
   case find ((== g) . snd) $ toList hy of
-    Just (v, _) -> pure $ noLoc $ HsVar NoExt $ noLoc $ Unqual v
+    Just (v, _) -> pure $ noLoc $ var' v
     Nothing -> throwError $ GoalMismatch "assumption" g
 
 
@@ -81,7 +86,7 @@ destruct' f term = rule $ \(Judgement hy g) -> do
         Nothing -> throwError $ GoalMismatch "destruct" g
         Just (tc, apps) -> do
           fmap noLoc
-              $ case' (HsVar NoExt $ noLoc $ Unqual term)
+              $ case' (var' term)
               <$> do
             for (tyConDataCons tc) $ \dc -> do
               let args = dataConInstArgTys dc apps
@@ -125,7 +130,7 @@ apply = rule $ \(Judgement hy g) -> do
       let (args, _) = splitFunTys ty
       sgs <- traverse (newSubgoal hy . CType) args
       pure . noLoc
-           . foldl' (@@) (HsVar NoExt $ noLoc $ Unqual func)
+           . foldl' (@@) (var' func)
            $ fmap unLoc sgs
     Nothing -> throwError $ GoalMismatch "apply" g
 

stack-8.6.4.yaml

@@ -28,6 +28,7 @@ extra-deps:
 - ghc-exactprint-0.6.2
 - ghc-lib-parser-8.10.1.20200523
 - ghc-lib-parser-ex-8.10.0.4
+- ghc-source-gen-0.4.0.0
 - haddock-api-2.22.0@rev:1
 - haddock-library-1.8.0
 - haskell-lsp-0.22.0.0