More CPP

Author: michaelpj

ghcide/src/Development/IDE/GHC/Compat.hs

@@ -429,8 +429,7 @@ generatedNodeInfo :: HieAST a -> Maybe (NodeInfo a)
 generatedNodeInfo = Map.lookup GeneratedInfo . getSourcedNodeInfo . sourcedNodeInfo
 
 data GhcVersion
-  = GHC92
-  | GHC94
+  = GHC94
   | GHC96
   | GHC98
   | GHC910
@@ -448,8 +447,6 @@ ghcVersion = GHC98
 ghcVersion = GHC96
 #elif MIN_VERSION_GLASGOW_HASKELL(9,4,0,0)
 ghcVersion = GHC94
-#elif MIN_VERSION_GLASGOW_HASKELL(9,2,0,0)
-ghcVersion = GHC92
 #endif
 
 simpleNodeInfoCompat :: FastStringCompat -> FastStringCompat -> NodeInfo a

plugins/hls-alternate-number-format-plugin/src/Ide/Plugin/Literals.hs

@@ -68,13 +68,8 @@ getPattern (L (locA -> (RealSrcSpan patSpan _)) pat) = case pat of
         HsInt _ val   -> fromIntegralLit patSpan val
         HsRat _ val _ -> fromFractionalLit patSpan val
         _             -> Nothing
-#if __GLASGOW_HASKELL__ == 902
-    NPat _ (L (RealSrcSpan sSpan _) overLit) _ _ -> fromOverLit overLit sSpan
-    NPlusKPat _ _ (L (RealSrcSpan sSpan _) overLit1) _ _ _ -> fromOverLit overLit1 sSpan
-#else
     NPat _ (L (locA -> (RealSrcSpan sSpan _)) overLit) _ _ -> fromOverLit overLit sSpan
     NPlusKPat _ _ (L (locA -> (RealSrcSpan sSpan _)) overLit1) _ _ _ -> fromOverLit overLit1 sSpan
-#endif
     _ -> Nothing
 getPattern _ = Nothing
 

plugins/hls-overloaded-record-dot-plugin/src/Ide/Plugin/OverloadedRecordDot.hs

@@ -289,7 +289,6 @@ getRecSels (unLoc -> XExpr (ExpandedThingRn a _)) = (collectRecordSelectors a, T
 #else
 getRecSels (unLoc -> XExpr (HsExpanded a _)) = (collectRecordSelectors a, True)
 #endif
-#if __GLASGOW_HASKELL__ >= 903
 -- applied record selection: "selector record" or "selector (record)" or
 -- "selector selector2.record2"
 getRecSels e@(unLoc -> HsApp _ se@(unLoc -> HsRecSel _ _) re) =
@@ -301,15 +300,6 @@ getRecSels e@(unLoc -> OpApp _ se@(unLoc -> HsRecSel _ _)
                         (unLoc -> HsVar _ (unLoc -> d)) re) | d == dollarName =
     ( [ RecordSelectorExpr (realSrcSpanToRange realSpan')  se re
       | RealSrcSpan realSpan' _ <- [ getLoc e ] ], False )
-#else
-getRecSels e@(unLoc -> HsApp _ se@(unLoc -> HsRecFld _ _) re) =
-    ( [ RecordSelectorExpr (realSrcSpanToRange realSpan') se re
-      | RealSrcSpan realSpan' _ <- [ getLoc e ] ], False )
-getRecSels e@(unLoc -> OpApp _ se@(unLoc -> HsRecFld _ _)
-                        (unLoc -> HsVar _ (unLoc -> d)) re) | d == dollarName =
-    ( [ RecordSelectorExpr (realSrcSpanToRange realSpan')  se re
-      | RealSrcSpan realSpan' _ <- [ getLoc e ] ], False )
-#endif
 getRecSels _ = ([], False)
 
 collectRecSelResult :: MonadIO m => IdeState -> NormalizedFilePath