Skip to content

Use exact print for suggest missing constraint code actions #1221

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Jan 17, 2021
Merged

Use exact print for suggest missing constraint code actions #1221

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7d605b2
Cache annotated AST
pepeiborra Jan 12, 2021
de1b0e8
instance ASTElement RdrName
pepeiborra Jan 16, 2021
38ce4c5
appendConstraint + Rewrite abstraction
pepeiborra Jan 16, 2021
d1b64bc
Refactor suggest constraint code action to use exactprint
pepeiborra Jan 17, 2021
99e6ed6
Catch missing 'Monad m' constraints too
pepeiborra Jan 17, 2021
bf12e63
Suggestions for missing implicit parameters
pepeiborra Jan 17, 2021
267c426
hlints
pepeiborra Jan 17, 2021
c8c0ced
Merge remote-tracking branch 'upstream/master' into implicit-params-e…
pepeiborra Jan 17, 2021
2bff533
compat
pepeiborra Jan 17, 2021
5512cba
Merge branch 'master' into implicit-params-exactprint-cleanup
mergify[bot] Jan 17, 2021
04bcae1
Include getAnnotatedParsedSourceRule in the main rule
pepeiborra Jan 17, 2021
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
34 changes: 26 additions & 8 deletions ghcide/src/Development/IDE/GHC/ExactPrint.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{-# LANGUAGE GADTs #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE TypeFamilies #-}

module Development.IDE.GHC.ExactPrint
( Graft(..),
Expand All @@ -16,8 +17,11 @@ module Development.IDE.GHC.ExactPrint
transformM,
useAnnotatedSource,
annotateParsedSource,
getAnnotatedParsedSourceRule,
GetAnnotatedParsedSource(..),
ASTElement (..),
ExceptStringT (..),
Annotated(..),
)
where

Expand All @@ -39,6 +43,9 @@ import Development.IDE.Core.Rules
import Development.IDE.Core.Shake
import Development.IDE.GHC.Compat hiding (parseExpr)
import Development.IDE.Types.Location
import Development.Shake (RuleResult, Rules)
import Development.Shake.Classes
import qualified GHC.Generics as GHC
import Generics.SYB
import Ide.PluginUtils
import Language.Haskell.GHC.ExactPrint
Expand All @@ -54,19 +61,30 @@ import Control.Arrow

------------------------------------------------------------------------------

data GetAnnotatedParsedSource = GetAnnotatedParsedSource
deriving (Eq, Show, Typeable, GHC.Generic)

instance Hashable GetAnnotatedParsedSource
instance NFData GetAnnotatedParsedSource
instance Binary GetAnnotatedParsedSource
type instance RuleResult GetAnnotatedParsedSource = Annotated ParsedSource

-- | Get the latest version of the annotated parse source.
useAnnotatedSource ::
String ->
IdeState ->
NormalizedFilePath ->
IO (Maybe (Annotated ParsedSource))
useAnnotatedSource herald state nfp =
fmap annotateParsedSource
<$> runAction herald state (use GetParsedModule nfp)
getAnnotatedParsedSourceRule :: Rules ()
getAnnotatedParsedSourceRule = define $ \GetAnnotatedParsedSource nfp -> do
pm <- use GetParsedModule nfp
return ([], fmap annotateParsedSource pm)

annotateParsedSource :: ParsedModule -> Annotated ParsedSource
annotateParsedSource = fixAnns

useAnnotatedSource ::
String ->
IdeState ->
NormalizedFilePath ->
IO (Maybe (Annotated ParsedSource))
useAnnotatedSource herald state nfp =
runAction herald state (use GetAnnotatedParsedSource nfp)
------------------------------------------------------------------------------

{- | A transformation for grafting source trees together. Use the semigroup
Expand Down
7 changes: 7 additions & 0 deletions ghcide/src/Development/IDE/GHC/Orphans.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import GhcPlugins
import qualified StringBuffer as SB
import Data.Text (Text)
import Data.String (IsString(fromString))
import Retrie.ExactPrint (Annotated)


-- Orphan instances for types from the GHC API.
Expand Down Expand Up @@ -144,3 +145,9 @@ instance NFData ModGuts where

instance NFData (ImportDecl GhcPs) where
rnf = rwhnf

instance Show (Annotated ParsedSource) where
show _ = "<Annotated ParsedSource>"

instance NFData (Annotated ParsedSource) where
rnf = rwhnf
5 changes: 4 additions & 1 deletion ghcide/src/Development/IDE/Plugin/CodeAction.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import Development.IDE.Core.RuleTypes
import Development.IDE.Core.Service
import Development.IDE.Core.Shake
import Development.IDE.GHC.Error
import Development.IDE.GHC.ExactPrint
import Development.IDE.LSP.Server
import Development.IDE.Plugin.CodeAction.PositionIndexed
import Development.IDE.Plugin.CodeAction.RuleTypes
Expand Down Expand Up @@ -66,7 +67,9 @@ plugin :: Plugin c
plugin = codeActionPluginWithRules rules codeAction <> Plugin mempty setHandlersCodeLens

rules :: Rules ()
rules = rulePackageExports
rules = do
rulePackageExports
getAnnotatedParsedSourceRule

-- | a command that blocks forever. Used for testing
blockCommandId :: T.Text
Expand Down