Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: Migrate hls-class-plugin to use structured diagnostics #4472

Draft
wants to merge 74 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
bd1404f
Change FileDiagnostic type synonym to a datatype
dylan-thinnes Jun 8, 2024
e684905
Make `ideErrorWithSource` produce FileDiagnostic by adding filepath arg
dylan-thinnes Jun 8, 2024
9d4cad1
Supply structured error wherever we easily can - TODOs for hard parts
dylan-thinnes Jun 9, 2024
e6a0b09
Fix UnitTests for new FileDiagnostic struct
dylan-thinnes Jun 9, 2024
d87c246
Remove explicit uses of FileDiagnostic, add codes to LSP diagnostics
dylan-thinnes Jun 9, 2024
cc2188c
Add field for expected error codes in ghcide tests
dylan-thinnes Jun 10, 2024
d2cbe55
Expect GHC-83865 for "type error" test - basic test
dylan-thinnes Jun 10, 2024
6e1eab7
Return structured warnings in TcModuleResult by copying from Driver
dylan-thinnes Jun 10, 2024
dcf9397
Store FileDiagnostic instead of LSP Diagnostic in Shake store
dylan-thinnes Jun 16, 2024
7bda67b
Add expected error codes for diagnostics that have them
dylan-thinnes Jun 16, 2024
6d1f0d7
Dispatch TODOs, amend remaining TODOs as future work
dylan-thinnes Jun 16, 2024
c92afae
Add scary comments all over copied code in Compat.Driver
dylan-thinnes Jun 16, 2024
b2fb63d
Update all remaining diagnostics that could use an expected error code
dylan-thinnes Jun 16, 2024
c6bc82d
Add _code to pretty printing for FileDiagnostic
dylan-thinnes Jun 16, 2024
9f5391b
Use case instead of `maybe` for StructuredMessage match
dylan-thinnes Jun 16, 2024
dd2229a
Use CPP to prevent setting _code before structured errors
dylan-thinnes Jun 16, 2024
094974d
Swap modifier for lenses, document StructuredMessage type
dylan-thinnes Jun 16, 2024
e948f2a
Add link to Issue & MR to Compat.Driver
dylan-thinnes Jun 16, 2024
79fd77e
Drop attachReason logic from withWarnings, technically incorrect
dylan-thinnes Jun 16, 2024
869edd6
Revert "Drop attachReason logic", needed by pragmas-plugin
dylan-thinnes Jun 16, 2024
1b2dd28
Fix plugins where necessary for new diagnostic structure
dylan-thinnes Jun 16, 2024
03c8409
Fix build issues with other tests from `expectDiagnostics`
dylan-thinnes Jun 16, 2024
2f83b0b
Improve comment on metadata fdStructuredMessage in FileDiagnostic
dylan-thinnes Jun 17, 2024
1cb1325
Add note to withWarnings explaining the current state of things
dylan-thinnes Jun 20, 2024
9337f25
Attach reasons into data field of LSP Diagnostic instead of code field
dylan-thinnes Jun 20, 2024
a857b9e
Fix up mistakes from merge, TODO fix merge issues for 9.3.0
dylan-thinnes Jun 20, 2024
14d6697
Set CodeDescription from HaskellErrorIndex when available
dylan-thinnes Jun 24, 2024
acbf1cb
Remove debugging print, fix expectation for preprocessor tests
dylan-thinnes Jun 27, 2024
413d1b8
Fix CPP for using Show instance on DiagnosticCode
dylan-thinnes Jun 27, 2024
926b6c4
Remove diagFromErrMsgs for GHC version < 9.6.1 using CPP
dylan-thinnes Jun 28, 2024
342b9fb
CPP fix
dylan-thinnes Jun 28, 2024
aaf5736
More stylish-haskell, more CPP fix
dylan-thinnes Jun 28, 2024
7215d80
Fix all stylish-haskell errors triggering
dylan-thinnes Jun 28, 2024
1a7856b
Fix more CPP
dylan-thinnes Jun 29, 2024
0a2174d
Only override the LSP diagnostic code when not already set
dylan-thinnes Jun 29, 2024
619098e
Fixes for stylish-haskell
dylan-thinnes Jun 29, 2024
361dd5b
Qualify s, t for FuzzySearch
dylan-thinnes Jun 29, 2024
1ec3db3
Ignore use of unsafePerformIO in FuzzySearch
dylan-thinnes Jun 29, 2024
ef5518f
Properly split GHC.Types.Error import in Diagnostics for stylish-haskell
dylan-thinnes Jun 30, 2024
45e77c7
Force type signature of annotation on FuzzySearch.dictionary
dylan-thinnes Jun 30, 2024
6ca2a19
DRY up definition of closure_errs
dylan-thinnes Jul 2, 2024
165e6b0
Remove unused imports
noughtmare Oct 17, 2024
1047d55
Post-rebase fixes
noughtmare Oct 17, 2024
a64120f
stylish-haskell formatting
noughtmare Oct 17, 2024
1fed0f9
Fix issue with GHC 9.4
noughtmare Oct 22, 2024
73bba51
Please stylish-haskell
noughtmare Oct 22, 2024
6c9860c
Ignore error codes when testing GHC 9.4
noughtmare Oct 22, 2024
c44a43d
Workaround darwin GHC bug in hls-hlint-plugin
noughtmare Oct 23, 2024
1f835da
Put the workaround in the right place
noughtmare Oct 23, 2024
1bc221c
Revert "Set CodeDescription from HaskellErrorIndex when available"
noughtmare Oct 24, 2024
16551d1
Resolve fendor's feedback
noughtmare Oct 24, 2024
5a6216b
Apply stylish-haskell formatting
noughtmare Oct 24, 2024
4465f49
Apply more stylish-haskell formatting
noughtmare Oct 24, 2024
79341ed
Merge branch 'master' into support-structured-diagnostics
soulomoon Oct 25, 2024
82367ec
Resolve some of soulomoon's feedback
noughtmare Oct 25, 2024
ada484e
Fix small issues
noughtmare Oct 25, 2024
6c05e23
Remove unused imports
noughtmare Oct 26, 2024
0776c65
Remove StructuredDiagnostic
noughtmare Oct 28, 2024
65300ef
Revert "Remove StructuredDiagnostic"
fendor Nov 21, 2024
649e2ba
Remove the unused parameter from 'ideErrorText'
fendor Nov 21, 2024
4c9e7a3
Add documentation to diagnostic helpers
fendor Nov 21, 2024
af34f06
Add action to query active diagnostics for a given Range
fendor Nov 30, 2024
92c8b4f
Use lens for updating Diagnostic
fendor Nov 30, 2024
d3b7fe6
Add GHC Structured Error compatibility module
fendor Nov 30, 2024
164dfe5
Remove unused imports
fendor Nov 30, 2024
31d1cee
Don't suggest -Wno-deferred-out-of-scope-variables (#4441)
jeukshi Nov 3, 2024
49b0ce1
Build HLS with GHC 9.8.3 (#4444)
fendor Nov 4, 2024
1feb07d
ci(mergify): upgrade configuration to current format (#4454)
mergify[bot] Nov 24, 2024
3ce3cfb
More tests and better docs for cabal-add (#4455)
VenInf Nov 25, 2024
54576e1
Fix compatibility with GHC 9.4 and rename function
fendor Dec 1, 2024
abd1a39
Use GHC Note syntax and reference Note in docs
fendor Dec 23, 2024
ada6ed6
Add doc comment for 'tmrWarnings'
fendor Dec 23, 2024
1398a0b
Push CPP statements to compatibility module
fendor Dec 23, 2024
a89da7a
Migrate hls-class-plugin to use StructuredMessage
fendor Nov 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,19 @@ queue_rules:
- name: default
# Mergify always respects the branch protection settings
# so we can left empty mergify own ones
conditions: []

pull_request_rules:
- name: Automatically merge pull requests
conditions:
queue_conditions:
- label=merge me
- '#approved-reviews-by>=1'
actions:
queue:
method: squash
name: default
# The queue action automatically updates PRs that
# have entered the queue, but in order to do that
# they must have passed CI. Since our CI is a bit
# flaky, PRs can fail to get in, which then means
# they don't get updated, which is extra annoying.
# This just adds the updating as an independent
# step.
merge_conditions: []
merge_method: squash

pull_request_rules:
- name: Automatically update pull requests
conditions:
- label=merge me
actions:
update:
- name: refactored queue action rule
conditions: []
actions:
queue:
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ packages:
./hls-test-utils


index-state: 2024-10-21T00:00:00Z
index-state: 2024-11-02T00:00:00Z

tests: True
test-show-details: direct
Expand Down
2 changes: 1 addition & 1 deletion ghcide-bench/src/Experiments.hs
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ experiments =
flip allM docs $ \DocumentPositions{..} -> do
bottom <- pred . length . T.lines <$> documentContents doc
diags <- getCurrentDiagnostics doc
case requireDiagnostic diags (DiagnosticSeverity_Error, (fromIntegral bottom, 8), "Found hole", Nothing) of
case requireDiagnostic diags (DiagnosticSeverity_Error, (fromIntegral bottom, 8), "Found hole", Just "GHC-88464", Nothing) of
Nothing -> pure True
Just _err -> pure False
),
Expand Down
3 changes: 3 additions & 0 deletions ghcide/ghcide.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ library
, hls-plugin-api == 2.9.0.1
, implicit-hie >= 0.1.4.0 && < 0.1.5
, lens
, lens-aeson
, list-t
, lsp ^>=2.7
, lsp-types ^>=2.3
Expand Down Expand Up @@ -150,7 +151,9 @@ library
Development.IDE.GHC.Compat
Development.IDE.GHC.Compat.Core
Development.IDE.GHC.Compat.CmdLine
Development.IDE.GHC.Compat.Driver
Development.IDE.GHC.Compat.Env
Development.IDE.GHC.Compat.Error
Development.IDE.GHC.Compat.Iface
Development.IDE.GHC.Compat.Logger
Development.IDE.GHC.Compat.Outputable
Expand Down
34 changes: 22 additions & 12 deletions ghcide/session-loader/Development/IDE/Session.hs
Original file line number Diff line number Diff line change
Expand Up @@ -573,10 +573,11 @@ loadSessionWithOptions recorder SessionLoadingOptions{..} rootDir que = do
this_flags = (this_error_env, this_dep_info)
this_error_env = ([this_error], Nothing)
this_error = ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) _cfp
$ T.unlines
[ "No cradle target found. Is this file listed in the targets of your cradle?"
, "If you are using a .cabal file, please ensure that this module is listed in either the exposed-modules or other-modules section"
]
(T.unlines
[ "No cradle target found. Is this file listed in the targets of your cradle?"
, "If you are using a .cabal file, please ensure that this module is listed in either the exposed-modules or other-modules section"
])
Nothing

void $ modifyVar' fileToFlags $ Map.insert hieYaml this_flags_map
void $ modifyVar' filesMap $ flip HM.union (HM.fromList (map ((,hieYaml) . fst) $ concatMap toFlagsMap all_targets))
Expand Down Expand Up @@ -797,10 +798,10 @@ setNameCache nc hsc = hsc { hsc_NC = nc }
-- GHC had an implementation of this function, but it was horribly inefficient
-- We should move back to the GHC implementation on compilers where
-- https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12162 is included
checkHomeUnitsClosed' :: UnitEnv -> OS.Set UnitId -> [DriverMessages]
checkHomeUnitsClosed' :: UnitEnv -> OS.Set UnitId -> Maybe (Compat.MsgEnvelope DriverMessage)
checkHomeUnitsClosed' ue home_id_set
| OS.null bad_unit_ids = []
| otherwise = [singleMessage $ GHC.mkPlainErrorMsgEnvelope rootLoc $ DriverHomePackagesNotClosed (OS.toList bad_unit_ids)]
| OS.null bad_unit_ids = Nothing
| otherwise = Just (GHC.mkPlainErrorMsgEnvelope rootLoc $ DriverHomePackagesNotClosed (OS.toList bad_unit_ids))
where
bad_unit_ids = upwards_closure OS.\\ home_id_set
rootLoc = mkGeneralSrcSpan (Compat.fsLit "<command line>")
Expand Down Expand Up @@ -875,10 +876,19 @@ newComponentCache recorder exts _cfp hsc_env old_cis new_cis = do
hscEnv' <- -- Set up a multi component session with the other units on GHC 9.4
Compat.initUnits dfs hsc_env

let closure_errs = checkHomeUnitsClosed' (hsc_unit_env hscEnv') (hsc_all_home_unit_ids hscEnv')
multi_errs = map (ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Warning) _cfp . T.pack . Compat.printWithoutUniques) closure_errs
let closure_errs = maybeToList $ checkHomeUnitsClosed' (hsc_unit_env hscEnv') (hsc_all_home_unit_ids hscEnv')
closure_err_to_multi_err err =
ideErrorWithSource
(Just "cradle") (Just DiagnosticSeverity_Warning) _cfp
(T.pack (Compat.printWithoutUniques (singleMessage err)))
#if MIN_VERSION_ghc(9,5,0)
(Just (fmap GhcDriverMessage err))
#else
Nothing
#endif
multi_errs = map closure_err_to_multi_err closure_errs
bad_units = OS.fromList $ concat $ do
x <- bagToList $ mapBag errMsgDiagnostic $ unionManyBags $ map Compat.getMessages closure_errs
x <- map errMsgDiagnostic closure_errs
DriverHomePackagesNotClosed us <- pure x
pure us
isBad ci = (homeUnitId_ (componentDynFlags ci)) `OS.member` bad_units
Expand Down Expand Up @@ -1223,6 +1233,6 @@ showPackageSetupException PackageSetupException{..} = unwords
, "failed to load packages:", message <> "."
, "\nPlease ensure that ghcide is compiled with the same GHC installation as the project."]

renderPackageSetupException :: FilePath -> PackageSetupException -> (NormalizedFilePath, ShowDiagnostic, Diagnostic)
renderPackageSetupException :: FilePath -> PackageSetupException -> FileDiagnostic
renderPackageSetupException fp e =
ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) (toNormalizedFilePath' fp) (T.pack $ showPackageSetupException e)
ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) (toNormalizedFilePath' fp) (T.pack $ showPackageSetupException e) Nothing
13 changes: 8 additions & 5 deletions ghcide/session-loader/Development/IDE/Session/Diagnostics.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

module Development.IDE.Session.Diagnostics where
import Control.Applicative
import Control.Lens
import Control.Monad
import qualified Data.Aeson as Aeson
import Data.List
Expand All @@ -27,11 +28,13 @@ data CradleErrorDetails =
Depicts the cradle error in a user-friendly way.
-}
renderCradleError :: CradleError -> Cradle a -> NormalizedFilePath -> FileDiagnostic
renderCradleError (CradleError deps _ec ms) cradle nfp
| HieBios.isCabalCradle cradle =
let (fp, showDiag, diag) = ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) nfp $ T.unlines $ map T.pack userFriendlyMessage in
(fp, showDiag, diag{_data_ = Just $ Aeson.toJSON CradleErrorDetails{cabalProjectFiles=absDeps}})
| otherwise = ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) nfp $ T.unlines $ map T.pack userFriendlyMessage
renderCradleError (CradleError deps _ec ms) cradle nfp =
let noDetails =
ideErrorWithSource (Just "cradle") (Just DiagnosticSeverity_Error) nfp (T.unlines $ map T.pack userFriendlyMessage) Nothing
in
if HieBios.isCabalCradle cradle
then noDetails & fdLspDiagnosticL %~ \diag -> diag{_data_ = Just $ Aeson.toJSON CradleErrorDetails{cabalProjectFiles=absDeps}}
else noDetails
where
absDeps = fmap (cradleRootDir cradle </>) deps
userFriendlyMessage :: [String]
Expand Down
Loading