Remove GLASGOW_HASKELL, and GHC94 from tests

Author: dschrempf

ghcide-test/exe/CompletionTests.hs

@@ -276,8 +276,7 @@ nonLocalCompletionTests =
   where
     brokenForWinGhc = knownBrokenOnWindows "Windows has strange things in scope for some reason"
     brokenForWinOldGhc =
-      knownBrokenInSpecificEnv [HostOS Windows, GhcVer GHC94] "Windows (GHC == 9.4) has strange things in scope for some reason"
-      . knownBrokenInSpecificEnv [HostOS Windows, GhcVer GHC96] "Windows (GHC == 9.6) has strange things in scope for some reason"
+      knownBrokenInSpecificEnv [HostOS Windows, GhcVer GHC96] "Windows (GHC == 9.6) has strange things in scope for some reason"
       . knownBrokenInSpecificEnv [HostOS Windows, GhcVer GHC98] "Windows (GHC == 9.8) has strange things in scope for some reason"
 
 otherCompletionTests :: [TestTree]
@@ -350,10 +349,11 @@ packageCompletionTests =
               , _label == "fromList"
               ]
         liftIO $ take 3 (sort compls') @?=
-          map ("Defined in "<>) (
-              [ "'Data.List.NonEmpty"
+          map ("Defined in "<>) [
+                "'Data.List.NonEmpty"
               , "'GHC.Exts"
-              ] ++ (["'GHC.IsList" | ghcVersion >= GHC94]))
+              , "'GHC.IsList"
+              ]
 
   , testSessionEmptyWithCradle "Map" "cradle: {direct: {arguments: [-hide-all-packages, -package, base, -package, containers, A]}}" $ do
         doc <- createDoc "A.hs" "haskell" $ T.unlines

ghcide-test/exe/DiagnosticTests.hs

@@ -343,19 +343,9 @@ tests = testGroup "diagnostics"
       expectDiagnostics
         [ ( "Main.hs"
           , [(DiagnosticSeverity_Error, (6, 9),
-                if ghcVersion >= GHC96 then
-                  "Variable not in scope: ThisList.map"
-                else if ghcVersion >= GHC94 then
-                  "Variable not in scope: map" -- See https://gitlab.haskell.org/ghc/ghc/-/issues/22130
-                else
-                  "Not in scope: \8216ThisList.map\8217", Just "GHC-88464")
+                  "Variable not in scope: ThisList.map", Just "GHC-88464")
             ,(DiagnosticSeverity_Error, (7, 9),
-                if ghcVersion >= GHC96 then
-                  "Variable not in scope: BaseList.x"
-                else if ghcVersion >= GHC94 then
-                  "Variable not in scope: x" -- See https://gitlab.haskell.org/ghc/ghc/-/issues/22130
-                else
-                  "Not in scope: \8216BaseList.x\8217", Just "GHC-88464")
+                  "Variable not in scope: BaseList.x", Just "GHC-88464")
             ]
           )
         ]
@@ -373,7 +363,7 @@ tests = testGroup "diagnostics"
       -- where appropriate. The warning should use an unqualified name 'Ord', not
       -- something like 'GHC.Classes.Ord'. The choice of redundant-constraints to
       -- test this is fairly arbitrary.
-          , [(DiagnosticSeverity_Warning, (2, if ghcVersion >= GHC94 then 7 else 0), "Redundant constraint: Ord a", Just "GHC-30606")
+          , [(DiagnosticSeverity_Warning, (2, 7), "Redundant constraint: Ord a", Just "GHC-30606")
             ]
           )
         ]

ghcide-test/exe/FindDefinitionAndHoverTests.hs

@@ -187,7 +187,7 @@ tests = let
   holeL65 = Position 65 8  ;  hleInfo2 = [ExpectHoverText ["_ :: a -> Maybe a"]]
   cccL17 = Position 17 16  ;  docLink = [ExpectHoverTextRegex "\\*Defined in 'GHC.Types'\\* \\*\\(ghc-prim-[0-9.]+\\)\\*\n\n"]
   imported = Position 56 13 ; importedSig = getDocUri "Foo.hs" >>= \foo -> return [ExpectHoverText ["foo", "Foo", "Haddock"], mkL foo 5 0 5 3]
-  reexported = Position 55 14 ; reexportedSig = getDocUri "Bar.hs" >>= \bar -> return [ExpectHoverText ["Bar", "Bar", "Haddock"], if ghcVersion >= GHC94 && ghcVersion < GHC910 then mkL bar 3 5 3 8 else mkL bar 3 0 3 14]
+  reexported = Position 55 14 ; reexportedSig = getDocUri "Bar.hs" >>= \bar -> return [ExpectHoverText ["Bar", "Bar", "Haddock"], if ghcVersion < GHC910 then mkL bar 3 5 3 8 else mkL bar 3 0 3 14]
   thLocL57 = Position 59 10 ; thLoc = [ExpectHoverText ["Identity"]]
   cmtL68 = Position 67  0  ;  lackOfdEq = [ExpectHoverExcludeText ["$dEq"]]
   import310 = Position 3 10; pkgTxt = [ExpectHoverText ["Data.Text\n\ntext-"]]

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

@@ -409,8 +409,7 @@ generatedNodeInfo :: HieAST a -> Maybe (NodeInfo a)
 generatedNodeInfo = Map.lookup GeneratedInfo . getSourcedNodeInfo . sourcedNodeInfo
 
 data GhcVersion
-  = GHC94
-  | GHC96
+  = GHC96
   | GHC98
   | GHC910
   | GHC912
@@ -426,10 +425,8 @@ ghcVersion = GHC912
 ghcVersion = GHC910
 #elif MIN_VERSION_GLASGOW_HASKELL(9,8,0,0)
 ghcVersion = GHC98
-#elif MIN_VERSION_GLASGOW_HASKELL(9,6,0,0)
+#else
 ghcVersion = GHC96
-#elif MIN_VERSION_GLASGOW_HASKELL(9,4,0,0)
-ghcVersion = GHC94
 #endif
 
 simpleNodeInfoCompat :: FastStringCompat -> FastStringCompat -> NodeInfo a

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

@@ -616,21 +616,11 @@ pattern ExposePackage s a mr = DynFlags.ExposePackage s a mr
 #endif
 
 isVisibleFunArg :: Development.IDE.GHC.Compat.Core.FunTyFlag -> Bool
-#if __GLASGOW_HASKELL__ >= 906
 isVisibleFunArg = TypesVar.isVisibleFunArg
 type FunTyFlag = TypesVar.FunTyFlag
-#else
-isVisibleFunArg VisArg = True
-isVisibleFunArg _ = False
-type FunTyFlag = TypesVar.AnonArgFlag
-#endif
 pattern FunTy :: Development.IDE.GHC.Compat.Core.FunTyFlag -> Type -> Type -> Type
 pattern FunTy af arg res <- TyCoRep.FunTy {ft_af = af, ft_arg = arg, ft_res = res}
 
-
--- type HasSrcSpan x a = (GenLocated SrcSpan a ~ x)
--- type HasSrcSpan x = () :: Constraint
-
 class HasSrcSpan a where
   getLoc :: a -> SrcSpan
 

hie-compat/src-ghc92/Compat/HieAst.hs

@@ -1040,10 +1040,6 @@ instance HiePass p => ToHie (PScoped (LocatedA (Pat (GhcPass p)))) where
               in [ toHie $ L ospan wrap
                  , toHie $ PS rsp scope pscope $ (L ospan pat)
                  ]
--- CHANGED: removed preprocessor stuff
--- #if __GLASGOW_HASKELL__ < 811
---           HieRn -> []
--- #endif
     where
       contextify :: a ~ LPat (GhcPass p) => HsConDetails (HsPatSigType (NoGhcTc (GhcPass p))) a (HsRecFields (GhcPass p) a)
                  -> HsConDetails (TScoped (HsPatSigType (NoGhcTc (GhcPass p)))) (PScoped a) (RContext (HsRecFields (GhcPass p) (PScoped a)))
@@ -1928,11 +1924,6 @@ instance HiePass p => ToHie (LocatedA (HsSplice (GhcPass p))) where
       HsSpliced _ _ _ ->
         []
       XSplice x -> case ghcPass @p of
--- CHANGED: removed preprocessor stuff
--- #if __GLASGOW_HASKELL__ < 811
---                      GhcPs -> noExtCon x
---                      GhcRn -> noExtCon x
--- #endif
                      GhcTc -> case x of
                                 HsSplicedT _ -> []
 

plugins/hls-change-type-signature-plugin/test/Main.hs

@@ -39,7 +39,7 @@ test :: TestTree
 test = testGroup "changeTypeSignature" [
         testRegexes
         , codeActionTest "TExpectedActual" 4 11
-        , knownBrokenForGhcVersions [GHC94 .. GHC912] "Error Message in 9.2+ does not provide enough info" $
+        , knownBrokenForGhcVersions [GHC96 .. GHC912] "Error Message in 9.2+ does not provide enough info" $
             codeActionTest "TRigidType" 4 14
         , codeActionTest "TRigidType2" 4 6
         , codeActionTest "TLocalBinding" 7 22

plugins/hls-eval-plugin/test/Main.hs

@@ -84,8 +84,8 @@ tests =
       evalInFile "T8.hs" "-- >>> 3 `div` 0" "-- divide by zero" -- The default for marking exceptions is False
   , goldenWithEval "Applies file LANGUAGE extensions" "T9" "hs"
   , goldenWithEval "Evaluate a type with :kind!" "T10" "hs"
-  , goldenWithEval' "Reports an error for an incorrect type with :kind!" "T11" "hs"
-        (if ghcVersion >= GHC94 then "ghc94.expected" else "expected")
+  -- TODO: I do not understand why this is 'ghc94.expected'.
+  , goldenWithEval' "Reports an error for an incorrect type with :kind!" "T11" "hs" "ghc94.expected"
   , goldenWithEval "Shows a kind with :kind" "T12" "hs"
   , goldenWithEval "Reports an error for an incorrect type with :kind" "T13" "hs"
   , goldenWithEval' "Returns a fully-instantiated type for :type" "T14" "hs" (if ghcVersion >= GHC98 then "ghc98.expected" else "expected") -- See https://gitlab.haskell.org/ghc/ghc/-/issues/24069
@@ -138,7 +138,6 @@ tests =
           GHC910 -> "ghc910.expected"
           GHC98  -> "ghc98.expected"
           GHC96  -> "ghc96.expected"
-          GHC94  -> "ghc94.expected"
   , goldenWithEval "Prelude has no special treatment, it is imported as stated in the module" "TPrelude" "hs"
   , goldenWithEval "Don't panic on {-# UNPACK #-} pragma" "TUNPACK" "hs"
   , goldenWithEval "Can handle eval inside nested comment properly" "TNested" "hs"
@@ -219,7 +218,7 @@ tests =
     knownBrokenInWindowsBeforeGHC912 msg =
         foldl (.) id
            [ knownBrokenInSpecificEnv [GhcVer ghcVer, HostOS Windows] msg
-           | ghcVer <- [GHC94 .. GHC910]
+           | ghcVer <- [GHC96 .. GHC910]
            ]
 
 goldenWithEval :: TestName -> FilePath -> FilePath -> TestTree

plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs

@@ -1481,11 +1481,6 @@ suggestNewImport df packageExportsMap ps fileContents Diagnostic{..}
         >>= (findImportDeclByModuleName hsmodImports . T.unpack)
         >>= ideclAs . unLoc
         <&> T.pack . moduleNameString . unLoc
-  , -- tentative workaround for detecting qualification in GHC 9.4
-    -- FIXME: We can delete this after dropping the support for GHC 9.4
-    qualGHC94 <-
-        guard (ghcVersion == GHC94)
-            *> extractQualifiedModuleNameFromMissingName (extractTextInRange _range fileContents)
   , Just (range, indent) <- newImportInsertRange ps fileContents
   , extendImportSuggestions <- matchRegexUnifySpaces msg
 #if MIN_VERSION_ghc(9,7,0)
@@ -1494,19 +1489,8 @@ suggestNewImport df packageExportsMap ps fileContents Diagnostic{..}
     "Perhaps you want to add ‘[^’]*’ to the import list in the import of ‘([^’]*)’"
 #endif
   = let qis = qualifiedImportStyle df
-        -- FIXME: we can use thingMissing once the support for GHC 9.4 is dropped.
-        -- In what fllows, @missing@ is assumed to be qualified name.
-        -- @thingMissing@ is already as desired with GHC != 9.4.
-        -- In GHC 9.4, however, GHC drops a module qualifier from a qualified symbol.
-        -- Thus we need to explicitly concatenate qualifier explicity in GHC 9.4.
-        missing
-            | GHC94 <- ghcVersion
-            , isNothing (qual <|> qual')
-            , Just q <- qualGHC94 =
-                qualify q thingMissing
-            | otherwise = thingMissing
         suggestions = nubSortBy simpleCompareImportSuggestion
-          (constructNewImportSuggestions packageExportsMap (qual <|> qual' <|> qualGHC94, missing) extendImportSuggestions qis) in
+          (constructNewImportSuggestions packageExportsMap (qual <|> qual', thingMissing) extendImportSuggestions qis) in
     map (\(ImportSuggestion _ kind (unNewImport -> imp)) -> (imp, kind, TextEdit range (imp <> "\n" <> T.replicate indent " "))) suggestions
   where
     qualify q (NotInScopeDataConstructor d) = NotInScopeDataConstructor (q <> "." <> d)

plugins/hls-refactor-plugin/test/Main.hs

@@ -1,5 +1,5 @@
-{-# LANGUAGE CPP                   #-}
 {-# LANGUAGE AllowAmbiguousTypes   #-}
+{-# LANGUAGE CPP                   #-}
 {-# LANGUAGE DataKinds             #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE GADTs                 #-}
@@ -1359,8 +1359,7 @@ extendImportTests = testGroup "extend import actions"
                     [ "import Data.Monoid (First (..))"
                     , "f = (First Nothing) <> mempty"
                     ])
-        , brokenForGHC94 "On GHC 9.4, the error messages with -fdefer-type-errors don't have necessary imported target srcspan info." $
-          testSession "extend single line qualified import with value" $ template
+        , testSession "extend single line qualified import with value" $ template
             [("ModuleA.hs", T.unlines
                     [ "module ModuleA where"
                     , "stuffA :: Double"
@@ -1552,8 +1551,7 @@ extendImportTests = testGroup "extend import actions"
                 )
                 (Range (Position 2 3) (Position 2 7))
             )
-        , ignoreForGhcVersions [GHC94] "Diagnostic message has no suggestions" $
-          testSession "type constructor name same as data constructor name" $ template
+        , testSession "type constructor name same as data constructor name" $ template
             [("ModuleA.hs", T.unlines
                     [ "module ModuleA where"
                     , "newtype Foo = Foo Int"
@@ -1855,7 +1853,7 @@ suggestImportTests = testGroup "suggest import actions"
 suggestAddRecordFieldImportTests :: TestTree
 suggestAddRecordFieldImportTests = testGroup "suggest imports of record fields when using OverloadedRecordDot"
   [ testGroup "The field is suggested when an instance resolution failure occurs"
-    ([ ignoreForGhcVersions [GHC94, GHC96] "Extension not present <9.2, and the assist is derived from the help message in >=9.4" theTest
+    ([ ignoreForGhcVersions [GHC96] "Extension not present <9.2, and the assist is derived from the help message in >=9.4" theTest
     ]
     ++ [
         theTestIndirect qualifiedGhcRecords polymorphicType
@@ -2619,9 +2617,7 @@ addTypeAnnotationsToLiteralsTest = testGroup "add type annotations to literals t
       , ""
       , "f = 1"
       ]
-      (if ghcVersion >= GHC94
-        then [ (DiagnosticSeverity_Warning, (3, 4), "Defaulting the type variable", Nothing) ]
-        else [ (DiagnosticSeverity_Warning, (3, 4), "Defaulting the following constraint", Nothing) ])
+      [ (DiagnosticSeverity_Warning, (3, 4), "Defaulting the type variable", Nothing) ]
       "Add type annotation ‘Integer’ to ‘1’"
       [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
       , "module A (f) where"
@@ -2638,9 +2634,7 @@ addTypeAnnotationsToLiteralsTest = testGroup "add type annotations to literals t
       , "    let x = 3"
       , "    in x"
       ]
-      (if ghcVersion >= GHC94
-        then [ (DiagnosticSeverity_Warning, (4, 12), "Defaulting the type variable", Nothing) ]
-        else [ (DiagnosticSeverity_Warning, (4, 12), "Defaulting the following constraint", Nothing) ])
+      [ (DiagnosticSeverity_Warning, (4, 12), "Defaulting the type variable", Nothing) ]
       "Add type annotation ‘Integer’ to ‘3’"
       [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
       , "module A where"
@@ -2658,9 +2652,7 @@ addTypeAnnotationsToLiteralsTest = testGroup "add type annotations to literals t
       , "    let x = let y = 5 in y"
       , "    in x"
       ]
-      (if ghcVersion >= GHC94
-        then [ (DiagnosticSeverity_Warning, (4, 20), "Defaulting the type variable", Nothing) ]
-        else [ (DiagnosticSeverity_Warning, (4, 20), "Defaulting the following constraint", Nothing) ])
+      [ (DiagnosticSeverity_Warning, (4, 20), "Defaulting the type variable", Nothing) ]
       "Add type annotation ‘Integer’ to ‘5’"
       [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
       , "module A where"
@@ -2679,15 +2671,9 @@ addTypeAnnotationsToLiteralsTest = testGroup "add type annotations to literals t
       , ""
       , "f = seq \"debug\" traceShow \"debug\""
       ]
-      (if ghcVersion >= GHC94
-        then
-          [ (DiagnosticSeverity_Warning, (6, 8), "Defaulting the type variable", Nothing)
-          , (DiagnosticSeverity_Warning, (6, 16), "Defaulting the type variable", Nothing)
-          ]
-        else
-          [ (DiagnosticSeverity_Warning, (6, 8), "Defaulting the following constraint", Nothing)
-          , (DiagnosticSeverity_Warning, (6, 16), "Defaulting the following constraint", Nothing)
-          ])
+      [ (DiagnosticSeverity_Warning, (6, 8), "Defaulting the type variable", Nothing)
+      , (DiagnosticSeverity_Warning, (6, 16), "Defaulting the type variable", Nothing)
+      ]
       ("Add type annotation ‘" <> stringLit <> "’ to ‘\"debug\"’")
       [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
       , "{-# LANGUAGE OverloadedStrings #-}"
@@ -2707,9 +2693,7 @@ addTypeAnnotationsToLiteralsTest = testGroup "add type annotations to literals t
       , ""
       , "f a = traceShow \"debug\" a"
       ]
-      (if ghcVersion >= GHC94
-        then [ (DiagnosticSeverity_Warning, (6, 6), "Defaulting the type variable", Nothing) ]
-        else [ (DiagnosticSeverity_Warning, (6, 6), "Defaulting the following constraint", Nothing) ])
+      [ (DiagnosticSeverity_Warning, (6, 6), "Defaulting the type variable", Nothing) ]
       ("Add type annotation ‘" <> stringLit <> "’ to ‘\"debug\"’")
       [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
       , "{-# LANGUAGE OverloadedStrings #-}"
@@ -2729,9 +2713,7 @@ addTypeAnnotationsToLiteralsTest = testGroup "add type annotations to literals t
       , ""
       , "f = seq (\"debug\" :: [Char]) (seq (\"debug\" :: [Char]) (traceShow \"debug\"))"
       ]
-      (if ghcVersion >= GHC94
-        then [ (DiagnosticSeverity_Warning, (6, 54), "Defaulting the type variable", Nothing) ]
-        else [ (DiagnosticSeverity_Warning, (6, 54), "Defaulting the following constraint", Nothing) ])
+      [ (DiagnosticSeverity_Warning, (6, 54), "Defaulting the type variable", Nothing) ]
       ("Add type annotation ‘"<> stringLit <>"’ to ‘\"debug\"’")
       [ "{-# OPTIONS_GHC -Wtype-defaults #-}"
       , "{-# LANGUAGE OverloadedStrings #-}"
@@ -3405,8 +3387,7 @@ exportUnusedTests = testGroup "export unused actions"
       ]
       (R 2 0 2 11)
       "Export ‘bar’"
-    , ignoreForGhcVersions [GHC94] "Diagnostic message has no suggestions" $
-      testSession "type is exported but not the constructor of same name" $ templateNoAction
+    , testSession "type is exported but not the constructor of same name" $ templateNoAction
         [ "{-# OPTIONS_GHC -Wunused-top-binds #-}"
         , "module A (Foo) where"
         , "data Foo = Foo"
@@ -4049,6 +4030,3 @@ pattern R x y x' y' = Range (Position x y) (Position x' y')
 -- @/var@
 withTempDir :: (FilePath -> IO a) -> IO a
 withTempDir f = System.IO.Extra.withTempDir $ (canonicalizePath >=> f)
-
-brokenForGHC94 :: String -> TestTree -> TestTree
-brokenForGHC94 = knownBrokenForGhcVersions [GHC94]