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

Change Type Signature Plugin #2660

Merged
merged 32 commits into from Mar 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d81d926
First go
drsooch Jan 24, 2022
bffba2a
Match against specific error message.
drsooch Jan 29, 2022
d88758b
Merge remote-tracking branch 'origin/master' into change-type-signature
drsooch Jan 29, 2022
80a8fa1
Basic Change Type Signature implementation.
drsooch Jan 31, 2022
1589059
Merge branch 'master' into change-type-signature
drsooch Jan 31, 2022
b144e1e
GHC 9.2.0 compat change
drsooch Jan 31, 2022
1d80aae
Merge branch 'master' into change-type-signature
drsooch Feb 1, 2022
15015ec
Lift expectedError message into a separate binding
drsooch Feb 2, 2022
68ccb81
Merge branch 'change-type-signature' of github.com:drsooch/haskell-la…
drsooch Feb 2, 2022
767f60f
Merge branch 'master' into change-type-signature
drsooch Feb 3, 2022
81d4939
Merge branch 'change-type-signature' of github.com:drsooch/haskell-la…
drsooch Feb 3, 2022
48e53fe
Move ChangeTypeAction into it's own plugin
drsooch Feb 8, 2022
61a711f
Add New Error Message parsing.
drsooch Feb 14, 2022
6ccd484
Added Error Message Validation to ignore bad Messages.
drsooch Feb 18, 2022
629a7cb
Merge remote-tracking branch 'upstream' into change-type-signature
drsooch Feb 18, 2022
a1db77f
Miscellaneous Cleanup.
drsooch Feb 18, 2022
481db1b
Update Tide Type Signature logic.
drsooch Feb 19, 2022
d3101d4
Remove locA (defaults to id in 8.10) to satisfy 9.0+
drsooch Feb 19, 2022
c640a29
Touch up 9.2.1
drsooch Feb 19, 2022
1f6c908
Merge branch 'master' into change-type-signature
drsooch Feb 20, 2022
4c482a8
Clean up review notes
drsooch Feb 20, 2022
7d7febc
Update stack.yamls
drsooch Feb 20, 2022
ab9646a
Fix copy-paste error
drsooch Feb 20, 2022
dfe4eb8
Merge branch 'master' into change-type-signature
drsooch Feb 22, 2022
2e8c95b
Fix Local Signature resolution
drsooch Feb 23, 2022
30750a7
Improve logging (#2558)
eddiemundo Feb 20, 2022
2b9f189
Delete the Telemetry log level (#2727)
michaelpj Feb 21, 2022
8541902
Merge remote-tracking branch 'refs/remotes/origin/change-type-signatu…
drsooch Feb 23, 2022
0590ed8
Wall and 9.2 fix
drsooch Feb 23, 2022
b166dbf
Remove unneeded comments/code
drsooch Feb 24, 2022
3ff1de4
Merge branch 'master' into change-type-signature
drsooch Feb 27, 2022
5b5533c
Merge branch 'master' into change-type-signature
pepeiborra Mar 3, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions cabal-ghc90.project
Expand Up @@ -27,6 +27,7 @@ packages:
./plugins/hls-call-hierarchy-plugin
./plugins/hls-alternate-number-format-plugin
./plugins/hls-selection-range-plugin
./plugins/hls-change-type-signature-plugin

tests: true

Expand Down
1 change: 1 addition & 0 deletions cabal-ghc921.project
Expand Up @@ -27,6 +27,7 @@ packages:
./plugins/hls-call-hierarchy-plugin
./plugins/hls-alternate-number-format-plugin
./plugins/hls-selection-range-plugin
./plugins/hls-change-type-signature-plugin

with-compiler: ghc-9.2.1

Expand Down
1 change: 1 addition & 0 deletions cabal.project
Expand Up @@ -27,6 +27,7 @@ packages:
./plugins/hls-alternate-number-format-plugin
./plugins/hls-qualify-imported-names-plugin
./plugins/hls-selection-range-plugin
./plugins/hls-change-type-signature-plugin

-- Standard location for temporary packages needed for particular environments
-- For example it is used in the project gitlab mirror to help in the MAcOS M1 build script
Expand Down
22 changes: 21 additions & 1 deletion docs/features.md
Expand Up @@ -18,7 +18,7 @@ Many of these are standard LSP features, but a lot of special features are provi
| [Highlight references](#highlight-references) | `textDocument/documentHighlight` |
| [Code actions](#code-actions) | `textDocument/codeAction` |
| [Code lenses](#code-lenses) | `textDocument/codeLens` |
| [Selection range](#selection-range) | `textDocument/selectionRange` |
| [Selection range](#selection-range) | `textDocument/selectionRange` |

The individual sections below also identify which [HLS plugin](./what-is-hls.md#hls-plugins) is responsible for providing the given functionality, which is useful if you want to raise an issue report or contribute!
Additionally, not all plugins are supported on all versions of GHC, see the [GHC version support page](supported-versions.md) for details.
Expand Down Expand Up @@ -237,6 +237,26 @@ Provides a variety of code actions for interactive code development, see <https:

![Wingman Demo](https://user-images.githubusercontent.com/307223/92657198-3d4be400-f2a9-11ea-8ad3-f541c8eea891.gif)

### Change Type Signature

Provided by: `hls-change-type-signature-plugin`

Code action kind: `quickfix`

Change/Update a type signature to match implementation.

Status: Until GHC 9.4, the implementation is ad-hoc and relies on GHC error messages to create a new signature. Not all GHC error messages are supported.
drsooch marked this conversation as resolved.
Show resolved Hide resolved

Known Limitations:
- Not all GHC error messages are supported
- Top-level and Function-local bindings with the same names can cause issues, such as incorrect signature changes or no code actions available.

![Change Type Signature Demo](../plugins/hls-change-type-signature-plugin/change1.gif)

![Change Type Signature Demo](../plugins/hls-change-type-signature-plugin/change2.gif)

[Link to Docs](../plugins/hls-change-type-signature/README.md)

## Code lenses

### Add type signature
Expand Down
6 changes: 6 additions & 0 deletions exe/Plugins.hs
Expand Up @@ -79,6 +79,9 @@ import qualified Ide.Plugin.AlternateNumberFormat as AlternateNumberFormat
import Ide.Plugin.SelectionRange as SelectionRange
#endif

#if changeTypeSignature
import Ide.Plugin.ChangeTypeSignature as ChangeTypeSignature
#endif
-- formatters

#if floskell
Expand Down Expand Up @@ -184,6 +187,9 @@ idePlugins recorder includeExamples = pluginDescToIdePlugins allPlugins
#endif
#if selectionRange
SelectionRange.descriptor "selectionRange" :
#endif
#if changeTypeSignature
ChangeTypeSignature.descriptor "changeTypeSignature" :
#endif
-- The ghcide descriptors should come last so that the notification handlers
-- (which restart the Shake build) run after everything else
Expand Down
11 changes: 11 additions & 0 deletions haskell-language-server.cabal
Expand Up @@ -182,6 +182,11 @@ flag selectionRange
default: True
manual: True

flag changeTypeSignature
description: Enable changeTypeSignature plugin
default: True
manual: True

-- formatters

flag floskell
Expand Down Expand Up @@ -299,6 +304,11 @@ common selectionRange
build-depends: hls-selection-range-plugin ^>=1.0.0.0
cpp-options: -DselectionRange

common changeTypeSignature
if flag(changeTypeSignature)
build-depends: hls-change-type-signature-plugin ^>=1.0.0.0
cpp-options: -DchangeTypeSignature

-- formatters

common floskell
Expand Down Expand Up @@ -334,6 +344,7 @@ executable haskell-language-server
-- plugins
, example-plugins
, callHierarchy
, changeTypeSignature
, class
, haddockComments
, eval
Expand Down
12 changes: 12 additions & 0 deletions hls-plugin-api/src/Ide/PluginUtils.hs
Expand Up @@ -27,13 +27,15 @@ module Ide.PluginUtils
subRange,
positionInRange,
usePropertyLsp,
getNormalizedFilePath,
response,
handleMaybe,
handleMaybeM,
)
where


import Control.Lens ((^.))
import Control.Monad.Extra (maybeM)
import Control.Monad.Trans.Class (lift)
import Control.Monad.Trans.Except (ExceptT, runExceptT, throwE)
Expand All @@ -54,6 +56,7 @@ import Language.LSP.Types hiding
SemanticTokensEdit (_start))
import qualified Language.LSP.Types as J
import Language.LSP.Types.Capabilities
import Language.LSP.Types.Lens (uri)

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

Expand Down Expand Up @@ -243,6 +246,15 @@ allLspCmdIds pid commands = concatMap go commands

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

getNormalizedFilePath :: Monad m => PluginId -> TextDocumentIdentifier -> ExceptT String m NormalizedFilePath
drsooch marked this conversation as resolved.
Show resolved Hide resolved
getNormalizedFilePath (PluginId plId) docId = handleMaybe errMsg
$ uriToNormalizedFilePath
$ toNormalizedUri uri'
where
errMsg = T.unpack $ "Error(" <> plId <> "): converting " <> getUri uri' <> " to NormalizedFilePath"
uri' = docId ^. uri

-- ---------------------------------------------------------------------
handleMaybe :: Monad m => e -> Maybe b -> ExceptT e m b
handleMaybe msg = maybe (throwE msg) return

Expand Down
201 changes: 201 additions & 0 deletions plugins/hls-change-type-signature-plugin/LICENSE
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
16 changes: 16 additions & 0 deletions plugins/hls-change-type-signature-plugin/README.md
@@ -0,0 +1,16 @@
# Change Type Signature Plugin
drsooch marked this conversation as resolved.
Show resolved Hide resolved
drsooch marked this conversation as resolved.
Show resolved Hide resolved

The change type signature plugin provides a code action to change a user's current type signature to it's actual type signature.
The plugin does not work in all error scenarios. Currently, the plugin uses GHC diagnostic messages to recover the actual type of a function.
If the plugin receives enough information it can correctly change the signature.

## Demo

![Change Type Signature One](change1.gif)

![Change Type Signature Two](change2.gif)


## Changelog
### 1.0.0.0
- First Release
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.