Update to ormolu 0.5.0 and simplify plugin #75
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Move makeDiffTextEdit from Haskell-IDE-Engine to PluginUtils.
fendor
commented
Apr 25, 2020
Comment on lines
+82
to
+91
| diffText' :: Bool -> (Uri,T.Text) -> T.Text -> WithDeletions -> WorkspaceEdit | ||
| diffText' supports (f,fText) f2Text withDeletions = | ||
| if supports | ||
| then WorkspaceEdit Nothing (Just docChanges) | ||
| else WorkspaceEdit (Just h) Nothing | ||
| where | ||
| diff = diffTextEdit fText f2Text withDeletions | ||
| h = H.singleton f diff | ||
| docChanges = J.List [docEdit] | ||
| docEdit = J.TextDocumentEdit (J.VersionedTextDocumentIdentifier f (Just 0)) diff |
There was a problem hiding this comment.
This indirection could be removed since diffText is pure anyways here.
There was a problem hiding this comment.
Which indirection? the ' on the name?
There was a problem hiding this comment.
yeah, there is both diffText and diffText'
alanz
reviewed
Apr 25, 2020
| @@ -95,7 +97,7 @@ library | |||
| Ide.Plugin.Brittany | |||
|
|
|||
| if impl(ghc >= 8.6) | |||
There was a problem hiding this comment.
For a potential future commit, for hls we always have GHC >= 8.6
alanz
approved these changes
Apr 25, 2020
| @@ -51,18 +47,7 @@ descriptor plId = PluginDescriptor | |||
|
|
|||
| provider :: FormattingProvider IO | |||
| #if __GLASGOW_HASKELL__ >= 806 | |||
There was a problem hiding this comment.
For future, we are not building below 8.6, can remove this. But should probably put a constraint on base in the main cabal file to enforce that.
fendor
commented
Apr 25, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Additionally:
ghc-checkConsiderably simplifies the plugin, since they do the heavy lifting. See tweag/ormolu#516 for the upstream issue.
Ought to fix #48