Skip to content

Commit f650d75

Browse files
committed
Create hls-plugin-api and move plugins to exe
1 parent cb861b8 commit f650d75

31 files changed

+296
-82
lines changed

cabal.project

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
packages:
22
./
33
ghcide
4+
hls-plugin-api
45

56
source-repository-package
67
type: git
File renamed without changes.

haskell-language-server.cabal

+33-82
Original file line numberDiff line numberDiff line change
@@ -36,95 +36,25 @@ common agpl
3636
cpp-options:
3737
-DAGPL
3838

39-
library
39+
executable haskell-language-server
4040
import: agpl
41-
exposed-modules:
42-
Ide.Logger
43-
Ide.Plugin
44-
Ide.Plugin.Config
41+
main-is: Main.hs
42+
hs-source-dirs:
43+
exe
44+
plugins/default/src
45+
other-modules:
46+
Arguments
4547
Ide.Plugin.Eval
4648
Ide.Plugin.Example
4749
Ide.Plugin.Example2
4850
Ide.Plugin.Fourmolu
49-
Ide.Plugin.GhcIde
5051
Ide.Plugin.ImportLens
5152
Ide.Plugin.Ormolu
5253
Ide.Plugin.Pragmas
5354
Ide.Plugin.Retrie
5455
Ide.Plugin.Floskell
55-
Ide.Plugin.Formatter
5656
Ide.Plugin.StylishHaskell
57-
Ide.PluginUtils
58-
Ide.Types
5957
Ide.Version
60-
other-modules:
61-
Paths_haskell_language_server
62-
hs-source-dirs:
63-
src
64-
build-depends:
65-
base >=4.12 && <5
66-
, aeson
67-
, binary
68-
, bytestring
69-
, containers
70-
, data-default
71-
, deepseq
72-
, Diff
73-
, directory
74-
, extra
75-
, filepath
76-
, floskell == 0.10.*
77-
, fourmolu ^>= 0.1
78-
, ghc
79-
, ghc-boot-th
80-
, ghcide >= 0.1
81-
, gitrev
82-
, hashable
83-
, haskell-lsp == 0.22.*
84-
, hie-bios >= 0.6.1 && < 0.8
85-
, hslogger
86-
, lens
87-
, ormolu ^>= 0.1.2
88-
, optparse-simple
89-
, process
90-
, regex-tdfa >= 1.3.1.0
91-
, retrie >= 0.1.1.0
92-
, safe-exceptions
93-
, shake >= 0.17.5
94-
, stylish-haskell == 0.11.*
95-
, temporary
96-
, text
97-
, time
98-
, transformers
99-
, unordered-containers
100-
include-dirs:
101-
include
102-
if os(windows)
103-
build-depends: Win32
104-
else
105-
build-depends: unix
106-
if flag(agpl)
107-
build-depends:
108-
brittany
109-
exposed-modules:
110-
Ide.Plugin.Brittany
111-
112-
ghc-options:
113-
-Wall
114-
-Wredundant-constraints
115-
-Wno-name-shadowing
116-
if flag(pedantic)
117-
ghc-options: -Werror
118-
119-
default-language: Haskell2010
120-
121-
executable haskell-language-server
122-
import: agpl
123-
main-is: Main.hs
124-
hs-source-dirs:
125-
exe
126-
other-modules:
127-
Arguments
12858
Paths_haskell_language_server
12959
autogen-modules:
13060
Paths_haskell_language_server
@@ -144,28 +74,48 @@ executable haskell-language-server
14474

14575
build-depends:
14676
base >=4.7 && <5
77+
, aeson
14778
, binary
79+
, bytestring
14880
, containers
14981
, data-default
82+
, deepseq
15083
, directory
15184
, extra
85+
, floskell
15286
, filepath
87+
, fourmolu
15388
, process
15489
, ghc
155-
--------------------------------------------------------------
90+
, ghc-boot-th
15691
, ghcide
15792
, gitrev
15893
, hashable
15994
, haskell-lsp
16095
, hie-bios
161-
, haskell-language-server
96+
, hls-plugin-api
16297
, hslogger
98+
, lens
16399
, optparse-applicative
100+
, optparse-simple
101+
, ormolu
102+
, regex-tdfa
103+
, retrie
164104
, safe-exceptions
165105
, shake >= 0.17.5
106+
, stylish-haskell
166107
, text
167108
, time
109+
, temporary
110+
, transformers
168111
, unordered-containers
112+
include-dirs:
113+
include
114+
if flag(agpl)
115+
build-depends:
116+
brittany
117+
other-modules:
118+
Ide.Plugin.Brittany
169119
default-language: Haskell2010
170120

171121
executable haskell-language-server-wrapper
@@ -175,6 +125,7 @@ executable haskell-language-server-wrapper
175125
exe
176126
other-modules:
177127
Arguments
128+
Ide.Version
178129
Paths_haskell_language_server
179130
autogen-modules:
180131
Paths_haskell_language_server
@@ -200,7 +151,7 @@ executable haskell-language-server-wrapper
200151
, ghc
201152
, ghc-paths
202153
, hie-bios
203-
, haskell-language-server
154+
, optparse-simple
204155
, optparse-applicative
205156
, process
206157
default-language: Haskell2010
@@ -213,7 +164,7 @@ common hls-test-utils
213164
hs-source-dirs: test/utils
214165
other-modules: Test.Hls.Util
215166
build-depends: base
216-
, haskell-language-server
167+
, hls-plugin-api
217168
, haskell-lsp
218169
, hie-bios
219170
, aeson
@@ -250,7 +201,7 @@ test-suite func-test
250201
, data-default
251202
, directory
252203
, filepath
253-
, haskell-language-server
204+
, hls-plugin-api
254205
, haskell-lsp
255206
, haskell-lsp-types
256207
, lens

hls-plugin-api/LICENSE

+201
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.

0 commit comments

Comments
 (0)