Skip to content

Fix hls-class-plugin on ghc-9.2 #2733

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 19 commits into from
Mar 6, 2022
Merged

Fix hls-class-plugin on ghc-9.2 #2733

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ef218f5
Fix codeAction on 9.2
July541 Feb 22, 2022
d5ef017
Enable test
July541 Feb 22, 2022
9bdeabd
pointCommand: MIN_VERSION_ghc to 9.2
July541 Feb 24, 2022
ef733b7
Specify version
July541 Feb 24, 2022
45d31a1
Fix edit command
July541 Feb 27, 2022
8fc8683
Enable class plugin in cabal
July541 Feb 27, 2022
48ff9d7
Merge branch 'master' into class-9.2
July541 Feb 27, 2022
412ed46
Merge branch 'master' into class-9.2
pepeiborra Feb 27, 2022
48c044e
Comment addWhere
July541 Feb 28, 2022
6d61e86
Merge branch 'master' into class-9.2
July541 Mar 2, 2022
2f4a08a
Unify the method of obtaining identifiers
July541 Mar 2, 2022
9723127
Merge branch 'master' of https://github.com/haskell/haskell-language-…
July541 Mar 4, 2022
77e7944
Remove CPP
July541 Mar 4, 2022
3146ee5
Remove compile flag
July541 Mar 4, 2022
dc2134c
Merge branch 'master' of https://github.com/haskell/haskell-language-…
July541 Mar 6, 2022
395faf3
Rewrite filter with more restricts
July541 Mar 6, 2022
ecec539
Merge branch 'master' of https://github.com/haskell/haskell-language-…
July541 Mar 6, 2022
96412f6
Merge branch 'master' into class-9.2
July541 Mar 6, 2022
986e4bf
Merge branch 'master' into class-9.2
July541 Mar 6, 2022
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
Prev Previous commit
Next Next commit
Unify the method of obtaining identifiers
  • Loading branch information
@July541
July541 committed Mar 2, 2022
commit 2f4a08afee0d1413f95e05f960025e0e37dddd69
4 changes: 2 additions & 2 deletions plugins/hls-class-plugin/src/Ide/Plugin/Class.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,12 @@ codeAction state plId (CodeActionParams _ _ docId _ context) = liftIO $ fmap (fr
(Map.keys . Map.filter isClassNodeIdentifier . Compat.getNodeIds)
#elif MIN_VERSION_ghc(9,0,0)
$ pointCommand hf (fromJust (fromCurrentRange pmap range) ^. J.start & J.character -~ 1)
( (Map.keys . Map.filter isClassNodeIdentifier . sourcedNodeIdents . sourcedNodeInfo)
( (Map.keys . Map.filter isClassNodeIdentifier . Compat.getNodeIds)
<=< nodeChildren
)
#else
$ pointCommand hf (fromJust (fromCurrentRange pmap range) ^. J.start & J.character -~ 1)
( (Map.keys . Map.filter isClassNodeIdentifier . nodeIdentifiers . nodeInfo)
( (Map.keys . Map.filter isClassNodeIdentifier . Compat.getNodeIds)
<=< nodeChildren
)
#endif
Expand Down