Skip to content

Commit edb150a

Browse files
committed
moved eval plugin to hls-eval-plugin (rebased and fixed)
1 parent d4f5d43 commit edb150a

File tree

123 files changed

+589
-327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+589
-327
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ defaults: &defaults
6565

6666
- run:
6767
name: Setup stack eval hie.html
68-
command: cp test/testdata/eval/hie-stack.yaml test/testdata/eval/hie.yaml
68+
command: cp plugins/hls-eval-plugin/test/testdata/hie-stack.yaml plugins/hls-eval-plugin/test/testdata/hie.yaml
6969

7070
- run:
7171
name: Setup stack eval stack.html
72-
command: grep '^resolver:\|^compiler:' stack-build.txt > test/testdata/eval/stack.yaml
72+
command: grep '^resolver:\|^compiler:' stack-build.txt > plugins/hls-eval-plugin/test/testdata/stack.yaml
7373

7474
- run:
7575
name: Test haskell-language-server func-test suite

cabal.project

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ packages:
66
./hls-plugin-api
77
./plugins/tactics
88
./plugins/hls-class-plugin
9+
./plugins/hls-eval-plugin
910
./plugins/hls-explicit-imports-plugin
1011
./plugins/hls-hlint-plugin
1112
./plugins/hls-retrie-plugin

haskell-language-server.cabal

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,7 @@ common class
166166

167167
common eval
168168
if flag(eval) || flag(all-plugins)
169-
hs-source-dirs: plugins/default/src
170-
other-modules: Ide.Plugin.Eval
171-
Ide.Plugin.Eval.Code
172-
Ide.Plugin.Eval.CodeLens
173-
Ide.Plugin.Eval.GHC
174-
Ide.Plugin.Eval.Parse.Option
175-
Ide.Plugin.Eval.Parse.Parser
176-
Ide.Plugin.Eval.Parse.Section
177-
Ide.Plugin.Eval.Parse.Token
178-
Ide.Plugin.Eval.Types
179-
Ide.Plugin.Eval.Util
180-
build-depends:
169+
build-depends: hls-eval-plugin
181170
cpp-options: -Deval
182171

183172
common importLens
@@ -306,14 +295,8 @@ executable haskell-language-server
306295
, safe-exceptions
307296
, shake >=0.17.5
308297
, temporary
309-
, time
310298
, transformers
311299
, unordered-containers
312-
, parser-combinators
313-
, pretty-simple
314-
, Diff
315-
, QuickCheck
316-
, ghc-paths
317300
, with-utf8
318301

319302
include-dirs: include
@@ -402,7 +385,7 @@ test-suite func-test
402385
, tasty-golden
403386
, tasty-rerun
404387

405-
hs-source-dirs: test/functional plugins/tactics/src
388+
hs-source-dirs: test/functional plugins/tactics/src plugins/hls-eval-plugin/test
406389

407390
main-is: Main.hs
408391
other-modules:

hie-cabal.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ cradle:
106106
- path: "./plugins/hls-class-plugin/src"
107107
component: "lib:hls-class-plugin"
108108

109+
- path: "./plugins/hls-eval-plugin/src"
110+
component: "lib:hls-eval-plugin"
111+
109112
- path: "./plugins/hls-explicit-imports-plugin/src"
110113
component: "lib:hls-explicit-imports-plugin"
111114

hie-stack.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,17 @@ cradle:
4040
- path: "./hls-plugin-api/src"
4141
component: "hls-plugin-api:lib"
4242

43-
# Plugins:
43+
# Plugins:
4444

4545
- path: "./plugins/hls-class-plugin/src"
4646
component: "hls-class-plugin:lib"
4747

4848
- path: "./plugins/hls-explicit-imports-plugin/src"
4949
component: "hls-explicit-imports-plugin:lib"
5050

51+
- path: "./plugins/hls-eval-plugin/src"
52+
component: "hls-eval-plugin:lib"
53+
5154
- path: "./plugins/hls-hlint-plugin/src"
5255
component: "hls-hlint-plugin:lib"
5356

nix/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ let
2121
hie-compat = gitignoreSource ../hie-compat;
2222
hls-plugin-api = gitignoreSource ../hls-plugin-api;
2323
hls-class-plugin = gitignoreSource ../plugins/hls-class-plugin;
24+
hls-eval-plugin = gitignoreSource ../plugins/hls-eval-plugin;
2425
hls-explicit-imports-plugin = gitignoreSource ../plugins/hls-explicit-imports-plugin;
2526
hls-hlint-plugin = gitignoreSource ../plugins/hls-hlint-plugin;
2627
hls-retrie-plugin = gitignoreSource ../plugins/hls-retrie-plugin;

plugins/hls-eval-plugin/LICENSE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
cabal-version: 2.2
2+
name: hls-eval-plugin
3+
version: 0.1.0.0
4+
synopsis: Eval plugin for Haskell Language Server
5+
license: Apache-2.0
6+
license-file: LICENSE
7+
8+
9+
build-type: Simple
10+
extra-source-files: LICENSE
11+
12+
library
13+
exposed-modules: Ide.Plugin.Eval
14+
hs-source-dirs: src
15+
other-modules:
16+
Ide.Plugin.Eval.Code
17+
Ide.Plugin.Eval.CodeLens
18+
Ide.Plugin.Eval.GHC
19+
Ide.Plugin.Eval.Parse.Option
20+
Ide.Plugin.Eval.Parse.Parser
21+
Ide.Plugin.Eval.Parse.Section
22+
Ide.Plugin.Eval.Parse.Token
23+
Ide.Plugin.Eval.Types
24+
Ide.Plugin.Eval.Util
25+
26+
build-depends:
27+
, aeson
28+
, base
29+
, containers
30+
, deepseq
31+
, Diff
32+
, directory
33+
, extra
34+
, filepath
35+
, ghc
36+
, ghc-boot-th
37+
, ghc-paths
38+
, ghcide
39+
, hashable
40+
, haskell-lsp
41+
, haskell-lsp-types
42+
, hls-plugin-api
43+
, parser-combinators
44+
, pretty-simple
45+
, QuickCheck
46+
, safe-exceptions
47+
, shake
48+
, temporary
49+
, text
50+
, time
51+
, transformers
52+
, unordered-containers
53+
54+
default-language: Haskell2010

test/functional/Eval.hs renamed to plugins/hls-eval-plugin/test/Eval.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,4 +208,4 @@ replaceUnicodeQuotes :: T.Text -> T.Text
208208
replaceUnicodeQuotes = T.replace "" "'" . T.replace "" "'"
209209

210210
evalPath :: FilePath
211-
evalPath = "test/testdata/eval"
211+
evalPath = "plugins/hls-eval-plugin/test/testdata"

shell.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ let defaultCompiler = "ghc" + lib.replaceStrings ["."] [""] haskellPackages.ghc.
3030
p.hie-compat
3131
p.hls-plugin-api
3232
p.hls-class-plugin
33+
p.hls-eval-plugin
3334
p.hls-explicit-imports-plugin
3435
p.hls-hlint-plugin
3536
p.hls-retrie-plugin

0 commit comments

Comments
 (0)