Skip to content

Commit 0692049

Browse files
jhrcekmichaelpj
jhrcek
authored and
michaelpj
committed
Remove no-longer-needed compat code, remove unused stuff
1 parent 9d3480a commit 0692049

File tree

10 files changed

+18
-51
lines changed

10 files changed

+18
-51
lines changed

‎ghcide/session-loader/Development/IDE/Session.hs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,12 +1223,6 @@ data PackageSetupException
12231223

12241224
instance Exception PackageSetupException
12251225

1226-
-- | Wrap any exception as a 'PackageSetupException'
1227-
wrapPackageSetupException :: IO a -> IO a
1228-
wrapPackageSetupException = handleAny $ \case
1229-
e | Just (pkgE :: PackageSetupException) <- fromException e -> throwIO pkgE
1230-
e -> (throwIO . PackageSetupException . show) e
1231-
12321226
showPackageSetupException :: PackageSetupException -> String
12331227
showPackageSetupException GhcVersionMismatch{..} = unwords
12341228
["ghcide compiled against GHC"

‎ghcide/src/Development/IDE/Core/Compile.hs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,9 +357,9 @@ tcRnModule hsc_env tc_helpers pmod = do
357357
((tc_gbl_env', mrn_info), splices, mod_env)
358358
<- captureSplicesAndDeps tc_helpers hsc_env_tmp $ \hscEnvTmp ->
359359
do hscTypecheckRename hscEnvTmp ms $
360-
HsParsedModule { hpm_module = parsedSource pmod,
361-
hpm_src_files = pm_extra_src_files pmod,
362-
hpm_annotations = pm_annotations pmod }
360+
HsParsedModule { hpm_module = parsedSource pmod
361+
, hpm_src_files = pm_extra_src_files pmod
362+
}
363363
let rn_info = case mrn_info of
364364
Just x -> x
365365
Nothing -> error "no renamed info tcRnModule"
@@ -1140,7 +1140,6 @@ parseFileContents env customPreprocessor filename ms = do
11401140
PFailedWithErrorMessages msgs -> throwE $ diagFromErrMsgs sourceParser dflags $ msgs dflags
11411141
POk pst rdr_module ->
11421142
let
1143-
hpm_annotations = mkApiAnns pst
11441143
psMessages = getPsMessages pst
11451144
in
11461145
do
@@ -1150,7 +1149,7 @@ parseFileContents env customPreprocessor filename ms = do
11501149
throwE $ diagFromStrings sourceParser DiagnosticSeverity_Error errs
11511150

11521151
let preproc_warnings = diagFromStrings sourceParser DiagnosticSeverity_Warning preproc_warns
1153-
(parsed', msgs) <- liftIO $ applyPluginsParsedResultAction env ms hpm_annotations parsed psMessages
1152+
(parsed', msgs) <- liftIO $ applyPluginsParsedResultAction env ms parsed psMessages
11541153
let (warns, errors) = renderMessages msgs
11551154

11561155
-- Just because we got a `POk`, it doesn't mean there
@@ -1193,7 +1192,7 @@ parseFileContents env customPreprocessor filename ms = do
11931192
-- filter them out:
11941193
srcs2 <- liftIO $ filterM doesFileExist srcs1
11951194

1196-
let pm = ParsedModule ms parsed' srcs2 hpm_annotations
1195+
let pm = ParsedModule ms parsed' srcs2
11971196
warnings = diagFromErrMsgs sourceParser dflags warns
11981197
pure (warnings ++ preproc_warnings, pm)
11991198

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

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,16 @@
55
module Development.IDE.GHC.Compat.Parser (
66
initParserOpts,
77
initParserState,
8-
ApiAnns,
98
PsSpan(..),
109
pattern HsParsedModule,
1110
type GHC.HsParsedModule,
1211
Development.IDE.GHC.Compat.Parser.hpm_module,
1312
Development.IDE.GHC.Compat.Parser.hpm_src_files,
14-
Development.IDE.GHC.Compat.Parser.hpm_annotations,
1513
pattern ParsedModule,
1614
Development.IDE.GHC.Compat.Parser.pm_parsed_source,
1715
type GHC.ParsedModule,
1816
Development.IDE.GHC.Compat.Parser.pm_mod_summary,
1917
Development.IDE.GHC.Compat.Parser.pm_extra_src_files,
20-
Development.IDE.GHC.Compat.Parser.pm_annotations,
21-
mkApiAnns,
2218
-- * API Annotations
2319
Anno.AnnKeywordId(..),
2420
pattern EpaLineComment,
@@ -55,41 +51,33 @@ initParserState :: ParserOpts -> StringBuffer -> RealSrcLoc -> PState
5551
initParserState =
5652
Lexer.initParserState
5753

58-
-- GHC 9.2 does not have ApiAnns anymore packaged in ParsedModule. Now the
59-
-- annotations are found in the ast.
60-
type ApiAnns = ()
61-
6254
#if MIN_VERSION_ghc(9,5,0)
63-
pattern HsParsedModule :: Located (HsModule GhcPs) -> [FilePath] -> ApiAnns -> GHC.HsParsedModule
55+
pattern HsParsedModule :: Located (HsModule GhcPs) -> [FilePath] -> GHC.HsParsedModule
6456
#else
65-
pattern HsParsedModule :: Located HsModule -> [FilePath] -> ApiAnns -> GHC.HsParsedModule
57+
pattern HsParsedModule :: Located HsModule -> [FilePath] -> GHC.HsParsedModule
6658
#endif
6759
pattern HsParsedModule
6860
{ hpm_module
6961
, hpm_src_files
70-
, hpm_annotations
71-
} <- ( (,()) -> (GHC.HsParsedModule{..}, hpm_annotations))
62+
} <- GHC.HsParsedModule{..}
7263
where
73-
HsParsedModule hpm_module hpm_src_files _hpm_annotations =
64+
HsParsedModule hpm_module hpm_src_files =
7465
GHC.HsParsedModule hpm_module hpm_src_files
7566

7667

77-
pattern ParsedModule :: ModSummary -> ParsedSource -> [FilePath] -> ApiAnns -> GHC.ParsedModule
68+
pattern ParsedModule :: ModSummary -> ParsedSource -> [FilePath] -> GHC.ParsedModule
7869
pattern ParsedModule
7970
{ pm_mod_summary
8071
, pm_parsed_source
8172
, pm_extra_src_files
82-
, pm_annotations
83-
} <- ( (,()) -> (GHC.ParsedModule{..}, pm_annotations))
73+
} <- GHC.ParsedModule{..}
8474
where
85-
ParsedModule ms parsed extra_src_files _anns =
75+
ParsedModule ms parsed extra_src_files =
8676
GHC.ParsedModule
8777
{ pm_mod_summary = ms
8878
, pm_parsed_source = parsed
8979
, pm_extra_src_files = extra_src_files
9080
}
9181
{-# COMPLETE ParsedModule :: GHC.ParsedModule #-}
9282

93-
mkApiAnns :: PState -> ApiAnns
94-
mkApiAnns = const ()
9583

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ getPsMessages :: PState -> PsMessages
4343
getPsMessages pst =
4444
uncurry PsMessages $ Lexer.getPsMessages pst
4545

46-
applyPluginsParsedResultAction :: HscEnv -> ModSummary -> Parser.ApiAnns -> ParsedSource -> PsMessages -> IO (ParsedSource, PsMessages)
47-
applyPluginsParsedResultAction env ms hpm_annotations parsed msgs = do
46+
applyPluginsParsedResultAction :: HscEnv -> ModSummary -> ParsedSource -> PsMessages -> IO (ParsedSource, PsMessages)
47+
applyPluginsParsedResultAction env ms parsed msgs = do
4848
-- Apply parsedResultAction of plugins
4949
let applyPluginAction p opts = parsedResultAction p opts ms
5050
fmap (\result -> (hpm_module (parsedResultModule result), (parsedResultMessages result))) $ runHsc env $ withPlugins
5151
(Env.hsc_plugins env)
5252
applyPluginAction
53-
(ParsedResult (HsParsedModule parsed [] hpm_annotations) msgs)
53+
(ParsedResult (HsParsedModule parsed []) msgs)
5454

5555
initializePlugins :: HscEnv -> IO HscEnv
5656
initializePlugins env = do

‎ghcide/test/exe/CradleTests.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import Control.Applicative.Combinators
1010
import Control.Lens ((^.))
1111
import Control.Monad.IO.Class (liftIO)
1212
import qualified Data.Text as T
13-
import Development.IDE.GHC.Compat (GhcVersion (..))
1413
import Development.IDE.GHC.Util
1514
import Development.IDE.Plugin.Test (WaitForIdeRuleResult (..))
1615
import Development.IDE.Test (expectDiagnostics,
@@ -30,7 +29,6 @@ import Language.LSP.Protocol.Types hiding
3029
import Language.LSP.Test
3130
import System.FilePath
3231
import System.IO.Extra hiding (withTempDir)
33-
import Test.Hls (ignoreForGhcVersions)
3432
import Test.Tasty
3533
import Test.Tasty.HUnit
3634

‎plugins/hls-eval-plugin/src/Ide/Plugin/Eval/CodeLens.hs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,6 @@ codeLens recorder st plId CodeLensParams{_textDocument} =
151151
dbg $ LogCodeLensFp fp
152152
(comments, _) <-
153153
runActionE "eval.GetParsedModuleWithComments" st $ useWithStaleE GetEvalComments nfp
154-
-- dbg "excluded comments" $ show $ DL.toList $
155-
-- foldMap (\(L a b) ->
156-
-- case b of
157-
-- AnnLineComment{} -> mempty
158-
-- AnnBlockComment{} -> mempty
159-
-- _ -> DL.singleton (a, b)
160-
-- )
161-
-- $ apiAnnComments' pm_annotations
162154
dbg $ LogCodeLensComments comments
163155

164156
-- Extract tests from source code

‎plugins/hls-refactor-plugin/src/Development/IDE/GHC/ExactPrint.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ getAnnotatedParsedSourceRule recorder = define (cmapWithPrio LogShake recorder)
158158
return ([], fmap annotateParsedSource pm)
159159

160160
annotateParsedSource :: ParsedModule -> ParsedSource
161-
annotateParsedSource (ParsedModule _ ps _ _) =
161+
annotateParsedSource (ParsedModule _ ps _) =
162162
#if MIN_VERSION_ghc(9,9,0)
163163
ps
164164
#else

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import Development.IDE.Core.Service
4747
import Development.IDE.Core.Shake hiding (Log)
4848
import Development.IDE.GHC.Compat hiding
4949
(ImplicitPrelude)
50-
import Development.IDE.GHC.Compat.ExactPrint
5150
import Development.IDE.GHC.Compat.Util
5251
import Development.IDE.GHC.Error
5352
import Development.IDE.GHC.ExactPrint
@@ -105,6 +104,7 @@ import Text.Regex.TDFA ((=~), (=~~))
105104
-- See Note [Guidelines For Using CPP In GHCIDE Import Statements]
106105

107106
#if !MIN_VERSION_ghc(9,9,0)
107+
import Development.IDE.GHC.Compat.ExactPrint (makeDeltaAst)
108108
import GHC (Anchor (anchor_op),
109109
AnchorOperation (..),
110110
EpaLocation (..))

‎plugins/hls-refactor-plugin/src/Development/IDE/Plugin/Plugins/AddArgument.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ appendFinalPatToMatches name = \case
126126
--
127127
-- TODO instead of inserting a typed hole; use GHC's suggested type from the error
128128
addArgumentAction :: ParsedModule -> Range -> T.Text -> Maybe T.Text -> Either PluginError [(T.Text, [TextEdit])]
129-
addArgumentAction (ParsedModule _ moduleSrc _ _) range name _typ = do
129+
addArgumentAction (ParsedModule _ moduleSrc _) range name _typ = do
130130
(newSource, _, _) <- runTransformT $ do
131131
(moduleSrc', join -> matchedDeclNameMay) <- addNameAsLastArgOfMatchingDecl
132132
#if MIN_VERSION_ghc(9,9,0)

‎plugins/hls-rename-plugin/test/Main.hs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ main = defaultTestRunner tests
2020
renamePlugin :: PluginTestDescriptor Rename.Log
2121
renamePlugin = mkPluginTestDescriptor Rename.descriptor "rename"
2222

23-
-- See https://github.com/wz1000/HieDb/issues/45
24-
recordConstructorIssue :: String
25-
recordConstructorIssue = "HIE references for record fields incorrect with GHC versions >= 9"
26-
2723
tests :: TestTree
2824
tests = testGroup "Rename"
2925
[ goldenWithRename "Data constructor" "DataConstructor" $ \doc ->

0 commit comments

Comments
 (0)