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

HLS Plugin to provide Alternate Literal Formats. #2350

Merged
merged 53 commits into from Dec 1, 2021
Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
861f4c0
Initialize and Setup Plugin Source.
drsooch Oct 28, 2021
dd27587
Provide Traversal Module to Haskell AST that collects Literals.
drsooch Nov 4, 2021
6e0ce9d
Change Literals module to return type.
drsooch Nov 5, 2021
0c3ff17
Implement Logic for actual CodeActions.
drsooch Nov 12, 2021
f1e8864
Clarify source code comments. Reformat file structure.
drsooch Nov 12, 2021
a3d4dac
Merge branch 'master' of https://github.com/haskell/haskell-language-…
drsooch Nov 12, 2021
547655b
Set up Test Scaffolding.
drsooch Nov 13, 2021
8598cf3
Merge branch 'master' of https://github.com/haskell/haskell-language-…
drsooch Nov 13, 2021
e4a7c37
Miscellaneous clean-up.
drsooch Nov 13, 2021
4ecfd4f
Use Regex to Match Source Text.
drsooch Nov 13, 2021
2a07712
Remove unneccessary diagnostics from Rule.
drsooch Nov 13, 2021
42d3bf4
Update all stack versions to include new Plugin.
drsooch Nov 14, 2021
b55345f
Clean up Conversion.hs and AlternateNumberFormat.
drsooch Nov 14, 2021
0326582
Update cabal file bounds and add Github workflow test
drsooch Nov 14, 2021
6219975
Add plugin package to all cabal.project
jneira Nov 15, 2021
cd545b6
Add plugin to test suite
jneira Nov 15, 2021
de70c80
Merge branch 'master' into alternate-number-format
jneira Nov 16, 2021
c0d34ae
Push SYB changes. Test.hs is merely for testing and will be removed p…
drsooch Nov 16, 2021
7ede480
Merge branch 'alternate-number-format' of github.com:drsooch/haskell-…
drsooch Nov 16, 2021
da62c98
Merge branch 'master' into alternate-number-format
jneira Nov 17, 2021
71f1d4c
Use Generics.SYB for parsing Literals from GHC Source.
drsooch Nov 18, 2021
b502b08
Merge branch 'master' of https://github.com/haskell/haskell-language-…
drsooch Nov 18, 2021
1c04762
Merge branch 'alternate-number-format' of github.com:drsooch/haskell-…
drsooch Nov 18, 2021
ec0463e
Update hls-alternate-number-format-plugin.cabal
drsooch Nov 18, 2021
ed99b6a
WIP: run tests
fendor Nov 18, 2021
a266634
Merge branch 'master' of https://github.com/haskell/haskell-language-…
drsooch Nov 19, 2021
47dbf57
Merge branch 'alternate-number-format' of github.com:drsooch/haskell-…
drsooch Nov 19, 2021
2f8ffc8
Merge branch 'drsooch-alternate-number-format' of github.com:fendor/h…
drsooch Nov 19, 2021
8e0cb4a
Test additions and GHC compatability changes.
drsooch Nov 21, 2021
7689e74
Merge branch 'master' into alternate-number-format
drsooch Nov 21, 2021
9dd1ba8
Removed dead code.
drsooch Nov 21, 2021
856cd92
Use Set to remove duplicates from CollectLiterals Result.
drsooch Nov 21, 2021
1e98f68
Delete Test.hs
drsooch Nov 21, 2021
7aedbc9
Add README and bump version to 1.0.0.0.
drsooch Nov 22, 2021
35da971
Update HLS cabal file for version change.
drsooch Nov 22, 2021
03efa21
Additional Tests.
drsooch Nov 22, 2021
0dacf5c
Merge branch 'alternate-number-format' of github.com:drsooch/haskell-…
drsooch Nov 22, 2021
ffa9259
Update Test file to use Path library function.
drsooch Nov 25, 2021
a8fd672
Miscellaneous Code Fixes.
drsooch Nov 27, 2021
d29f732
Merge branch 'master' into alternate-number-format
drsooch Nov 29, 2021
646bddc
Add README to Extra Source Files.
drsooch Nov 29, 2021
def9cac
Merge branch 'master' into alternate-number-format
jneira Nov 29, 2021
b424cfb
Update Extra Source Files to include Test Haskell Source files.
drsooch Nov 30, 2021
681dc5b
Merge branch 'alternate-number-format' of github.com:drsooch/haskell-…
drsooch Nov 30, 2021
b573bff
Update Features.md and Minor Bug Fix :)
drsooch Nov 30, 2021
8097915
Merge branch 'master' into alternate-number-format
drsooch Nov 30, 2021
63d836d
Merge branch 'master' into alternate-number-format
jneira Nov 30, 2021
eb05482
Add new plugins to hackage workflow
jneira Nov 30, 2021
3fa9569
Merge branch 'master' into alternate-number-format
jneira Nov 30, 2021
54eab6d
Merge branch 'master' into alternate-number-format
jneira Nov 30, 2021
7c2e121
Fix Bug caused by Minor Bug Fix.
drsooch Dec 1, 2021
ec6846d
Merge branch 'alternate-number-format' of github.com:drsooch/haskell-…
drsooch Dec 1, 2021
e5b3a96
Merge branch 'master' into alternate-number-format
jneira Dec 1, 2021
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
5 changes: 5 additions & 0 deletions .github/workflows/test.yml
Expand Up @@ -224,6 +224,11 @@ jobs:
name: Test hls-hlint-plugin test suite
run: cabal test hls-hlint-plugin --test-options="-j1 --rerun-update" || cabal test hls-hlint-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-hlint-plugin --test-options="-j1 --rerun"

- if: matrix.test
name: Test hls-alternate-number-format-plugin test suite
run: cabal test hls-alternate-number-format-plugin --test-options="-j1 --rerun-update" || cabal test hls-alternate-number-format-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-alternate-number-format-plugin --test-options="-j1 --rerun"


test_post_job:
if: always()
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions cabal-ghc901.project
Expand Up @@ -24,6 +24,7 @@ packages:
./plugins/hls-module-name-plugin
./plugins/hls-ormolu-plugin
./plugins/hls-call-hierarchy-plugin
./plugins/hls-alternate-number-format-plugin

with-compiler: ghc-9.0.1

Expand Down
1 change: 1 addition & 0 deletions cabal-ghc921.project
Expand Up @@ -23,6 +23,7 @@ packages:
./plugins/hls-module-name-plugin
./plugins/hls-ormolu-plugin
./plugins/hls-call-hierarchy-plugin
./plugins/hls-alternate-number-format-plugin

with-compiler: ghc-9.2.1

Expand Down
1 change: 1 addition & 0 deletions cabal.project
Expand Up @@ -24,6 +24,7 @@ packages:
./plugins/hls-module-name-plugin
./plugins/hls-ormolu-plugin
./plugins/hls-call-hierarchy-plugin
./plugins/hls-alternate-number-format-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
7 changes: 7 additions & 0 deletions exe/Plugins.hs
Expand Up @@ -65,6 +65,10 @@ import Ide.Plugin.Pragmas as Pragmas
import Ide.Plugin.Splice as Splice
#endif

#if alternateNumberFormat
import Ide.Plugin.AlternateNumberFormat as AlternateNumberFormat
#endif

-- formatters

#if floskell
Expand Down Expand Up @@ -154,6 +158,9 @@ idePlugins includeExamples = pluginDescToIdePlugins allPlugins
#endif
#if splice
Splice.descriptor "splice" :
#endif
#if alternateNumberFormat
AlternateNumberFormat.descriptor "alternateNumberFormat" :
#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 @@ -156,6 +156,11 @@ flag splice
default: True
manual: True

flag alternateNumberFormat
description: Enable Alternate Number Format plugin
default: True
manual: True

-- formatters

flag floskell
Expand Down Expand Up @@ -253,6 +258,11 @@ common splice
build-depends: hls-splice-plugin ^>=1.0.0.1
cpp-options: -Dsplice

common alternateNumberFormat
if flag(alternateNumberFormat)
build-depends: hls-alternate-number-format-plugin ^>=1.0.0.0
cpp-options: -DalternateNumberFormat

-- formatters

common floskell
Expand Down Expand Up @@ -297,6 +307,7 @@ executable haskell-language-server
, moduleName
, pragmas
, splice
, alternateNumberFormat
, floskell
, fourmolu
, ormolu
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
201 changes: 201 additions & 0 deletions plugins/hls-alternate-number-format-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.
40 changes: 40 additions & 0 deletions plugins/hls-alternate-number-format-plugin/README.md
@@ -0,0 +1,40 @@
# Alternate Number Format Plugin

The alternate number format plugin provides alternative formatting for Numeric Literals in source code.
These can be any numeric literal such as `123`, `0x45` or any of the other numeric formats.
The plugin is context aware and will provide suggestions based on currently active GHC extensions.

## Setup

The plugin requires no extra setup to work. Simply place your cursor on top of a literal and invoke the `codeAction` command for your editor.

## Demo

![Alternate format suggestions](HLSInt.gif)

### Currently Supported GHC Extensions:
- `BinaryLiterals`
- `HexFloatLiterals`
- `NumDecimalLiterals`

## Design

The plugin is relatively simple, it traverses a files source contents using the GHC API. As it encounters Literals (of the type `HsExpr` with the constructor of either `HsLit` or `HsOverLit`), it will construct an internal `Literal` datatype that has additional information for use to generate suggestions.
Currently, the traversal is done in the file, `Literal.hs`, using the package [SYB](https://hackage.haskell.org/package/syb) for most of the heavy lifting.

The plugin extends on top of SYB as the traversal done by basic combinators is not perfect. For whatever reason, when starting at the root `ParsedModule` the SYB traversal ignores Pattern Binds (`LPat GhcPs`). As a result, a combinator was created to match on TWO separate underlying types to dispatch on.

To generate suggestions, the plugin leverages the `Numeric` package which provides a multitude of conversion functions to and from strings/numerics. The only slight change is the addition of extra work when using `NumDecimals` extension. The plugin will attempt to generate 3 choices for the user (this choice is not given for `Fractional` numerics).

### Known Quirks
- Currently (and probably inefficiently), a Set is used as general accumulator for all Literals being captured. This is because again, through the intricacies of using SYB, we somehow will traverse Source Text multiple times and collect duplicate literals.

- In the Test Suite, we are required to be explicit in where our `codeActions` will occur. Otherwise, a simple call to `getAllCodeActions` will not work, for whatever reason, there is not enough time to generate the code actions.

- `PrimLiterals` are currently ignored. GHC API does not attach Source Text to Primitive Literal Nodes. As such these are ignored in the plugin.

- Similarly, anything that produces a bad Source Span (i.e. can't be easily replaced by an edit) is ignored as well.

## Changelog
### 1.0.0.0
- First Release