git.iko.soy/haskell-nova
on 2939a48 help sign in
7882415
swap
0 ahead, 12 behind
5 files changed+398−464
since splitsnapshots
unifiedsplit
Haskell Language Server.novaextension/Scripts/download.js+1−42 Haskell Language Server.novaextension/Scripts/main.js+6−5 Haskell Language Server.novaextension/Scripts/utils.js+1−92 Haskell Language Server.novaextension/Syntaxes/Haskell.xml+231−125 Haskell Language Server.novaextension/extension.json+159−200
Haskell Language Server.novaextension/Scripts/download.js+1−42
@@ -5,8 +5,6 @@ const {
55const {
66 readStream,
77 getStorage,
8− call,
9− hasCustomEnv
108} = require("utils");
119
1210exports.getHLS = getHLS;
@@ -45,9 +43,6 @@ async function downloadTool(name) {
4543 const storagePath = getStorageForTool(name);
4644 console.log("Downloading " + storagePath);
4745 const urls = await getHLSAssets();
48− if (!(name in urls)) {
49− sendPermanentNotification("There is no pre-built HLS for GHC " + name ,"There is no pre-built version of HLS for GHC " + name + ". You can either build HLS yourself or update your project to one of the pre-built versions: https://github.com/haskell/haskell-language-server/releases")
50− }
5146 const response = await fetch(urls[name]);
5247 if (!response.ok) {
5348 console.error(response.statusText);
@@ -133,7 +128,7 @@ async function getGHCVersion() {
133128 sendPermanentNotification(
134129 tool + " not installed!",
135130 "Please install " + tool +
136− " and restart Haskell Language Server.",
131+ " and restart Haskell Language Server.",
137132 );
138133 } else {
139134 sendPermanentNotification("Couldn't detect GHC version", x);
@@ -146,28 +141,7 @@ async function getGHCVersion() {
146141 return promise;
147142}
148143async function getHLS() {
149− const explicitPath = nova.workspace.config.get("haskell-language-server-path")
150− if (explicitPath) {
151− sendNotification("HLS path specified in settings", "Using the path to haskell-language-server specified in settings.")
152− return explicitPath
153− }
154−
155− const localHLSPath = await which("haskell-language-server").catch((_) => null)
156− if (hasCustomEnv() && localHLSPath) {
157− return localHLSPath
158− }
159−
160144 const version = await getGHCVersion();
161− if (localHLSPath) {
162− sendNotification("Found HLS", "Found haskell-language-server in PATH. Checking if it is the right version.")
163− const v = await getHLSVersion(localHLSPath)
164− if (v === version) {
165− sendNotification("Using local HLS", "The haskell-language-server in PATH has the right version. Using it.")
166− return localHLSPath
167− } else {
168− sendNotification("Not using local HLS", "The haskell-language-server in PATH is built fot GHC " + v + " but we need GHC " + version + ". Trying other alternatives.")
169− }
170− }
171145 return await getTool(version);
172146}
173147
@@ -182,18 +156,3 @@ function getToolName(name) {
182156function notifyToolDownloading(name) {
183157 sendNotification("Downloading tool", "Downloading " + getToolName(name));
184158}
185−
186−function getHLSVersion(path) {
187− return call(path, {
188− args: ["--version"],
189− })
190− .then((x) => x.match(/\(GHC: (\S+)\)/)[1].trim())
191− .catch((err) => sendPermanentNotification("HLS version check failed", err))
192−}
193−
194−function which(name) {
195− return call("/usr/bin/which", {
196− args: [name],
197− shell: true,
198− }).then((p) => p.trim())
199−}
Haskell Language Server.novaextension/Scripts/main.js+6−5
@@ -9,9 +9,8 @@ const {
99 getHLSConfig,
1010} = require("configuration");
1111const {
12− getFileName, createEnv, getEnv
12+ getFileName,
1313} = require("utils");
14−
1514exports.activate = function () {
1615 nova.commands.register("stop", (_workspace) => {
1716 stopServer();
@@ -108,12 +107,10 @@ function applyAllLSPEdits(edits, text) {
108107}
109108let lspClient = null;
110109async function startServer() {
111− await createEnv()
112110 stopServer();
113111 const path = await getServerPath();
114− const env = await getEnv()
115112 const serverOptions = {
116− path, env,
113+ path: path,
117114 args: ["lsp", "--cwd", nova.workspace.path],
118115 };
119116 const clientOptions = {
@@ -140,3 +137,7 @@ function stopServer() {
140137function getServerPath() {
141138 return getHLS();
142139}
140+
141+// function getLogPath() {
142+// return getStorage() + "/haskell-language-server.log";
143+// }
Haskell Language Server.novaextension/Scripts/utils.js+1−92
@@ -1,8 +1,3 @@
1−const {
2− sendNotification,
3− sendPermanentNotification,
4−} = require("notifications");
5−
61function readStream(readableStream) {
72 return new Promise((resolve, _reject) => {
83 const reader = readableStream.getReader();
@@ -53,90 +48,4 @@ function traceRaw(x) {
5348 return x;
5449}
5550
56−async function call(path, args) {
57− const env = await getEnv()
58− const process = new Process(path, {...args, ...{env}});
59− const promise = new Promise((resolve, reject) => {
60− process.onDidExit((exitCode) => {
61− console.log(exitCode)
62− if (exitCode == 0) {
63− readStream(process.stdout).then((x) => {
64− resolve(x);
65− });
66− } else {
67− readStream(process.stderr).then((x) => {
68− reject(x)
69− });
70− }
71− });
72− })
73− process.start()
74− return promise
75−}
76−
77−
78−function parseEnvs(x) {
79− const env = {}
80− for (line of x.split("\n")) {
81− const res = line.match(/(.*?)=(.*)/)
82− if (res) {
83− env[res[1]] = res[2]
84− }
85− }
86−
87− console.log(JSON.stringify(env))
88−
89− return env
90−}
91−
92−let envCache = null
93−
94−async function createEnv() {
95− const generator = nova.workspace.config.get("env-generator")
96− if (generator) {
97− const [prog, ...args] = generator.split(/\s+/)
98− sendNotification("Generating environment", "Executing " + generator + ".")
99− const process = new Process(prog, {
100− shell: true,
101− args,
102− cwd: nova.workspace.path
103− });
104− const promise = new Promise((resolve, reject) => {
105− process.onDidExit((exitCode) => {
106− console.log(exitCode)
107− if (exitCode == 0) {
108− readStream(process.stdout).then((x) => {
109− resolve(x);
110− });
111− } else {
112− readStream(process.stderr).then((x) => {
113− reject(x)
114− });
115− }
116− });
117− })
118− process.start()
119−
120− const envStr = await promise
121− .catch((err) => sendPermanentNotification("Generating environment failed", err))
122− envCache = parseEnvs(envStr)
123− } else {
124− envCache = {}
125− }
126−}
127−
128−async function getEnv() {
129− console.log(JSON.stringify(envCache))
130− if (!envCache) {
131− await createEnv()
132− }
133− return envCache
134−}
135−
136−
137−function hasCustomEnv() {
138− return (nova.workspace.config.get("env-generator") !== null)
139−}
140−
141−module.exports = { readStream, getStorage, getFileName, trace, traceRaw, call, createEnv, hasCustomEnv, getEnv };
142−
51+module.exports = { readStream, getStorage, getFileName, trace, traceRaw };
Haskell Language Server.novaextension/Syntaxes/Haskell.xml+231−125
@@ -1,9 +1,9 @@
11<?xml version="1.0" encoding="UTF-8"?>
22<syntax name="haskell">
33 <meta>
4− <name>Haskell</name>
5− <type>compiled</type>
6− <preferred-file-extension>hs</preferred-file-extension>
4+ <name>Haskell</name>
5+ <type>compiled</type>
6+ <preferred-file-extension>hs</preferred-file-extension>
77 </meta>
88
99 <detectors>
@@ -57,6 +57,7 @@
5757 <include syntax="self" collection="type-family-definition" />
5858 <include syntax="self" collection="pattern-definition" />
5959 <include syntax="self" collection="type-definition" />
60+ <!-- <include syntax="self" collection="type-annotation" /> -->
6061 <include syntax="self" collection="GADT-definition" />
6162 <include syntax="self" collection="instance" />
6263 <include syntax="self" collection="typeclass" />
@@ -65,6 +66,7 @@
6566
6667 <template-scopes>
6768 <include syntax="self" collection="Quote" />
69+ <include syntax="self" collection="comments" />
6870 </template-scopes>
6971
7072 <collections>
@@ -77,27 +79,51 @@
7779 </collection>
7880
7981 <collection name="expressions">
80− <scope name="haskell.construct.keyword.at">
81− <expression>@</expression>
82− </scope>
83− <scope name="haskell.construct.keyword.case-arrow">
84− <expression>-&gt;</expression>
85− </scope>
86− <scope name="haskell.construct.keyword.bind-arrow">
87− <expression>&lt;-</expression>
88− </scope>
89− <include syntax="self" collection="keywords" />
82+ <include syntax="self" collection="do-bind" />
9083 <include syntax="self" collection="literal" />
9184 <include syntax="self" collection="operators" />
92− <include syntax="self" collection="record-match" />
9385 <include syntax="self" collection="list" />
94− <include syntax="self" collection="view-pattern" />
9586 <include syntax="self" collection="lambda-case" />
9687 <include syntax="self" collection="lambda-head" />
97− <include syntax="self" collection="case-expression" />
98− <include syntax="self" collection="qconid" />
88+ <include syntax="self" collection="type-applications" />
89+ <include syntax="self" collection="outer-case-expression" />
9990 <include syntax="self" collection="qvarid" />
10091 <include syntax="self" collection="tuple" />
92+
93+
94+ <!-- Needed for do binds -->
95+ <!-- <include syntax="self" collection="pattern-match" /> -->
96+ </collection>
97+
98+ <collection name="pattern-match">
99+ <include syntax="self" collection="literal" />
100+ <include syntax="self" collection="tuple-match" />
101+ <!-- <include syntax="self" collection="at-pattern" /> -->
102+ <include syntax="self" collection="varid" />
103+ <include syntax="self" collection="qconid" />
104+ <include syntax="self" collection="record-match" />
105+ <include syntax="self" collection="list-pattern" />
106+ <include syntax="self" collection="view-pattern" />
107+ </collection>
108+
109+ <collection name="type-applications">
110+ <scope name="type-applications">
111+ <starts-with>
112+ <expression>(\s@)\(</expression>
113+ <capture number="1" name="haskell.keyword.operator.typeapplication" />
114+ </starts-with>
115+ <ends-with>
116+ <expression>)</expression>
117+ </ends-with>
118+ <subscopes>
119+ <include syntax="self" collection="type" />
120+ </subscopes>
121+ </scope>
122+ <scope name="type-applications-single">
123+ <expression>(@)(\w+)</expression>
124+ <capture number="1" name="haskell.keyword.operator.typeapplication" />
125+ <capture number="2" name="haskell.identifier.type" />
126+ </scope>
101127 </collection>
102128
103129 <collection name="Quote">
@@ -136,8 +162,8 @@
136162 <capture number="1" name="haskell.pattern.record.bracket" />
137163 </ends-with>
138164 <subscopes>
139− <include syntax="self" collection="comments" />
140− <include syntax="self" collection="expressions" />
165+ <include syntax="self" collection="pattern-match" />
166+ <include syntax="self" collection="varid" />
141167 <scope name="record-sep">
142168 <expression>=</expression>
143169 </scope>
@@ -159,7 +185,6 @@
159185 <capture number="1" name="haskell.pattern.record.bracket" />
160186 </ends-with>
161187 <subscopes>
162− <include syntax="self" collection="comments" />
163188 <scope name="haskell.pattern.record.wildcard">
164189 <expression>\.\.</expression>
165190 </scope>
@@ -186,12 +211,29 @@
186211 <capture number="1" name="haskell.list.bracket" />
187212 </ends-with>
188213 <subscopes>
189− <include syntax="self" collection="comments" />
190214 <include syntax="self" collection="expressions" />
191215 </subscopes>
192216 </scope>
193217 </collection>
194218
219+ <collection name="list-pattern">
220+ <symbol type="expression" />
221+ <scope name="haskell.pattern.list">
222+ <starts-with>
223+ <expression>(\[)</expression>
224+ <capture number="1" name="haskell.pattern.list.bracket" />
225+ </starts-with>
226+ <ends-with>
227+ <expression>(\])</expression>
228+ <capture number="1" name="haskell.pattern.list.bracket" />
229+ </ends-with>
230+ <subscopes>
231+ <include syntax="self" collection="pattern-match" />
232+ </subscopes>
233+ </scope>
234+ </collection>
235+
236+
195237 <collection name="view-pattern">
196238 <scope name="haskell.pattern.view">
197239 <symbol type="expression" />
@@ -208,7 +250,24 @@
208250 <scope name="haskell.pattern.view.operator.arrow">
209251 <expression>-&gt;</expression>
210252 </scope>
211− <include syntax="self" collection="expressions" />
253+ <include syntax="self" collection="pattern-match" />
254+ </subscopes>
255+ </scope>
256+ </collection>
257+
258+ <collection name="tuple-match">
259+ <symbol type="expression" />
260+ <scope name="haskell.pattern.tuple">
261+ <starts-with>
262+ <expression>(\()</expression>
263+ <capture number="1" name="haskell.pattern.tuple.bracket" />
264+ </starts-with>
265+ <ends-with>
266+ <expression>(\))</expression>
267+ <capture number="1" name="haskell.pattern.tuple.bracket" />
268+ </ends-with>
269+ <subscopes>
270+ <include syntax="self" collection="pattern-match" />
212271 </subscopes>
213272 </scope>
214273 </collection>
@@ -224,11 +283,53 @@
224283 <capture number="1" name="haskell.case.keyword.condition" />
225284 </ends-with>
226285 <subscopes anchored="true">
286+ <include syntax="self" collection="pattern-match" />
287+ </subscopes>
288+ </scope>
289+ </collection>
290+
291+ <collection name="case-match">
292+ <scope name="case-match">
293+ <starts-with>
294+ <expression>(?=((\h*)\S.*-&gt;($|\h)))</expression>
295+ </starts-with>
296+ <ends-with>
297+ <expression>-&gt;</expression>
298+ </ends-with>
299+ <subscopes anchored="true">
300+ <include syntax="self" collection="pattern-match" />
301+ </subscopes>
302+ </scope>
303+ </collection>
304+
305+ <collection name="inner-case-expressions">
306+ <scope name="inner-case-expressions">
307+ <starts-with>
308+ <expression>(?=((\h*)\S.*-&gt;($|\h)))</expression>
309+ </starts-with>
310+ <ends-with>
311+ <template>^(?!\1)(?!\2\h)(?!\s*$)</template>
312+ </ends-with>
313+ <subscopes>
314+ <include syntax="self" collection="case-match" />
227315 <include syntax="self" collection="expressions" />
228316 </subscopes>
229317 </scope>
230318 </collection>
231319
320+ <collection name="outer-case-expression">
321+ <scope name="outer-case-expression">
322+ <starts-with>
323+ <expression>(?=case)</expression>
324+ </starts-with>
325+ <ends-with />
326+ <subscopes anchored="true" skip-whitespace="false">
327+ <include syntax="self" collection="case-expression" />
328+ <include syntax="self" collection="inner-case-expressions" repeat="true" />
329+ </subscopes>
330+ </scope>
331+ </collection>
332+
232333 <collection name="tuple">
233334 <symbol type="expression" />
234335 <scope name="haskell.tuple">
@@ -241,73 +342,60 @@
241342 <capture number="1" name="haskell.tuple.bracket" />
242343 </ends-with>
243344 <subscopes>
244− <include syntax="self" collection="comments" />
245345 <include syntax="self" collection="expressions" />
246346 </subscopes>
247347 </scope>
248348 </collection>
249349
250350 <collection name="typeclass">
251− <scope name="haskell.definition.class.head">
252− <symbol type="class" scope="global" name-selector="haskell.keyword.construct.class.name">
253− <context behavior="whitespace" foldable="true" />
254− </symbol>
351+ <symbol type="interface" />
352+ <scope name="haskell.definition.class">
255353 <starts-with>
256354 <expression>^(\h*)(class)($|\h)</expression>
257355 <capture number="2" name="haskell.keyword.construct.class" />
258356 </starts-with>
259− <ends-with />
260− <subscopes anchored="true">
261− <scope name="haskell.keyword.construct.class.name">
262− <starts-with>
263− <expression></expression>
264− </starts-with>
265− <ends-with>
266− <expression>(?=(where|^\s*$))</expression>
267− </ends-with>
268− <subscopes>
269− <include syntax="self" collection="comments" />
270− <include syntax="self" collection="type" />
271− </subscopes>
272− </scope>
273− <scope name="haskell.keyword.construct.where" optional="true">
357+ <ends-with>
358+ <template>^(?!\s+\1\S)(?!\s*$)</template>
359+ </ends-with>
360+ <subscopes>
361+ <scope name="haskell.keyword.construct.where">
274362 <expression>where</expression>
275363 </scope>
364+ <include syntax="self" collection="type" />
365+ <include syntax="self" collection="type-definition" />
366+ <!-- <include syntax="self" collection="type-annotation" /> -->
367+ <include syntax="self" collection="definition" />
276368 </subscopes>
277369 </scope>
278370 </collection>
279371
280372 <collection name="instance">
281373 <scope name="haskell.instance">
282− <symbol type="category" name-selector="haskell.keyword.construct.instance.name">
283− <context behavior="whitespace" foldable="true" />
284− </symbol>
374+ <symbol type="category" />
285375 <starts-with>
286376 <expression>^(\h*)(instance)($|\h)</expression>
287377 <capture number="2" name="haskell.keyword.construct.instance" />
288378 </starts-with>
289− <ends-with />
290− <subscopes anchored="true">
291− <scope name="haskell.keyword.construct.instance.name">
292− <starts-with>
293− <expression></expression>
294− </starts-with>
295− <ends-with>
296− <expression>(?=(where|^\s*$))</expression>
297− </ends-with>
298− <subscopes>
299− <include syntax="self" collection="type" />
300− </subscopes>
301− </scope>
302− <scope name="haskell.keyword.construct.where" optional="true">
379+ <ends-with>
380+ <template>^(?!\s+\1\S)(?!\s*$)</template>
381+ </ends-with>
382+ <subscopes>
383+ <scope name="haskell.keyword.construct.where">
303384 <expression>where</expression>
304385 </scope>
386+ <include syntax="self" collection="type" />
387+ <include syntax="self" collection="type-definition" />
388+ <include syntax="self" collection="type-annotation" />
389+ <include syntax="self" collection="definition" />
305390 </subscopes>
306391 </scope>
307392 </collection>
308393
309394 <collection name="type-family-definition">
310395 <scope name="haskell.definition.type-family.type">
396+ <symbol type="type">
397+ <context behavior="subtree" foldable="false" />
398+ </symbol>
311399 <starts-with>
312400 <expression>^(\h*)(type\h+family)</expression>
313401 <capture number="2" name="haskell.keyword.construct.type-family" />
@@ -346,7 +434,6 @@
346434 <template>^(?!\s+\1\S)(?!\s*$)</template>
347435 </ends-with>
348436 <subscopes>
349− <include syntax="self" collection="comments" />
350437 <include syntax="self" collection="type" optional="true" repeat="true" />
351438 <scope>
352439 <expression>=</expression>
@@ -359,26 +446,65 @@
359446 <collection name="definition">
360447 <scope name="haskell.definition.type.function">
361448 <symbol type="function">
362− <context behavior="whitespace" foldable="true" />
449+ <display-name>
450+ <component selector="haskell.definition.type.function" />
451+ </display-name>
452+
363453 </symbol>
364454 <starts-with>
365455 <expression>^(?=(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h))</expression>
366456 <capture number="2" name="haskell.keyword.construct.default" />
367− <capture number="3" name="haskell.identifier.function.name" />
457+ <capture number="3" name="haskell.identifier.function" />
368458 </starts-with>
369459 <ends-with>
370460 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
371461 </ends-with>
372462 <subscopes>
373− <include syntax="self" collection="comments" />
374463 <include syntax="self" collection="type-annotation" />
375464 <include syntax="self" collection="implementation" />
376465 </subscopes>
377466 </scope>
378467 </collection>
379468
469+ <collection name="do-bind">
470+ <scope name="do-bind">
471+ <starts-with>
472+ <expression>^(?=((\h*)\S.+&lt;-($|\h)))</expression>
473+ </starts-with>
474+ <ends-with>
475+ <template>^(?!\1)(?!\2\h)(?!\s*$)</template>
476+ </ends-with>
477+ <subscopes>
478+ <include syntax="self" collection="do-pattern" />
479+ <include syntax="self" collection="expressions" />
480+ <!-- <scope name="bind-arrow">
481+ <expression>&lt;-</expression>
482+ </scope> -->
483+ </subscopes>
484+ </scope>
485+ </collection>
486+
487+ <collection name="do-pattern">
488+ <scope name="do-pattern">
489+ <starts-with>
490+ <expression>^(?=((\h*)\S.+&lt;-($|\h)))</expression>
491+ </starts-with>
492+ <ends-with>
493+ <expression>&lt;-</expression>
494+ </ends-with>
495+ <subscopes>
496+ <include syntax="self" collection="pattern-match" />
497+ <!-- <scope name="bind-arrow">
498+ <expression>&lt;-</expression>
499+ </scope>
500+ <include syntax="self" collection="expressions" repeat="true" /> -->
501+ </subscopes>
502+ </scope>
503+ </collection>
504+
380505 <collection name="implementation">
381− <scope name="haskell.definition.type.function.implementation">
506+ <scope name="haskell.definition.type.function">
507+ <local scope="within-construct" />
382508 <starts-with>
383509 <expression>^(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h)</expression>
384510 <capture number="2" name="haskell.keyword.construct.default" />
@@ -388,20 +514,14 @@
388514 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
389515 </ends-with>
390516 <subscopes>
391− <include syntax="self" collection="comments" />
392− <include syntax="self" collection="pattern-match" optional="true" repeat="true" />
393− <scope>
394− <expression>=</expression>
395− <capture number="0" name="haskell.construct.function.keyword.eq" />
396− </scope>
397− <include syntax="self" collection="expressions" optional="true" repeat="true" />
398− <include syntax="self" collection="where-clause" optional="true" />
517+ <include syntax="self" collection="where-clause" />
518+ <include syntax="self" collection="expressions" />
399519 </subscopes>
400520 </scope>
401521 </collection>
402522
403523 <collection name="type-annotation">
404− <scope name="haskell.definition.type.function.type-signature">
524+ <scope name="haskell.definition.type.function">
405525 <starts-with>
406526 <expression>^(\h*)`?(\w(\w|')*)`?\h*::($|\h)</expression>
407527 <capture number="2" name="haskell.identifier.function" />
@@ -410,7 +530,6 @@
410530 <template>^(?!\s+\1\S)(?!\s*$)</template>
411531 </ends-with>
412532 <subscopes>
413− <include syntax="self" collection="comments" />
414533 <include syntax="self" collection="type" />
415534 </subscopes>
416535 </scope>
@@ -418,19 +537,15 @@
418537
419538 <collection name="type-definition">
420539 <scope name="haskell.definition.type">
421− <symbol type="type" scope="global">
422− <context behavior="whitespace" foldable="true" />
423− </symbol>
424540 <starts-with>
425541 <expression>^(\h*)(type)\h+(\w(\w|')*)</expression>
426542 <capture number="2" name="haskell.keyword.construct.type" />
427− <capture number="3" name="haskell.identifier.type.name" />
543+ <capture number="3" name="haskell.identifier.type" />
428544 </starts-with>
429545 <ends-with>
430546 <template>^(?!\s+\1\S)(?!\s*$)</template>
431547 </ends-with>
432548 <subscopes>
433− <include syntax="self" collection="comments" />
434549 <include syntax="self" collection="type" />
435550 </subscopes>
436551 </scope>
@@ -438,7 +553,7 @@
438553
439554 <collection name="GADT-definition">
440555 <scope name="haskell.definition.struct.GADT">
441− <symbol type="struct" scope="global">
556+ <symbol type="struct">
442557 <context behavior="subtree" foldable="false" />
443558 </symbol>
444559 <starts-with>
@@ -450,7 +565,6 @@
450565 <template>^(?!\s+\1\S)(?!\s*$)</template>
451566 </ends-with>
452567 <subscopes>
453− <include syntax="self" collection="comments" />
454568 <scope name="haskell.keyword.construct.where">
455569 <expression>where</expression>
456570 </scope>
@@ -466,26 +580,21 @@
466580 <collection name="gadt-constructor">
467581 <scope name="haskell.identifier.type.struct.data.constructor">
468582 <symbol type="constructor">
469− <context behavior="subtree" foldable="true" />
583+ <context behavior="whitespace" />
470584 </symbol>
471− <starts-with>
472− <expression>(^|=|\||^)\h+([A-Z](\w|')*)</expression>
473− <capture number="2" name="haskell.identifier.data.name" />
474− </starts-with>
475− <ends-with />
476− <subscopes anchored="true">
477− <include syntax="self" collection="record-definition" />
478− </subscopes>
585+ <expression>(^|=|\|)\h+([A-Z](\w|')*)</expression>
586+ <capture number="2" name="haskell.identifier.data.name" />
587+ </scope>
588+ <scope name="identifier.type.struct.GADT.constructor">
589+ <symbol type="constructor"></symbol>
590+ <expression>^\h+([A-Z](\w|')*)</expression>
591+ <capture number="1" name="haskell.identifier.data.name" />
479592 </scope>
480593 </collection>
481594
482595 <collection name="deriving-clause">
483596 <scope name="haskell.record.construct.deriving.keyword">
484− <expression>deriving(\h+(newtype|stock|anyclass))?</expression>
485− </scope>
486− <scope name="haskell.record.construct.deriving.keyword">
487− <include syntax="self" collection="comments" />
488− <expression>via</expression>
597+ <expression>deriving\h+(newtype|stock|anyclass)</expression>
489598 </scope>
490599 </collection>
491600
@@ -503,7 +612,6 @@
503612 <capture number="1" name="haskell.record.bracket" />
504613 </ends-with>
505614 <subscopes>
506− <include syntax="self" collection="comments" />
507615 <include syntax="self" collection="record-definition-field-name" />
508616 <include syntax="self" collection="type" />
509617 </subscopes>
@@ -520,13 +628,6 @@
520628 </collection>
521629
522630 <collection name="type">
523− <scope name="haskell.keyword.construct.function-arrow">
524− <expression>-&gt;</expression>
525− </scope>
526− <scope name="haskell.keyword.construct.fat-arrow">
527− <expression>=&gt;</expression>
528− </scope>
529− <include syntax="self" collection="strings" />
530631 <scope name="haskell.type.construct.tuple">
531632 <starts-with>
532633 <expression>\(</expression>
@@ -535,7 +636,6 @@
535636 <expression>\)</expression>
536637 </ends-with>
537638 <subscopes>
538− <include syntax="self" collection="comments" />
539639 <scope name="haskell.construct.type.typle.comma">
540640 <expression>\,</expression>
541641 </scope>
@@ -550,7 +650,6 @@
550650 <expression>\]</expression>
551651 </ends-with>
552652 <subscopes>
553− <include syntax="self" collection="comments" />
554653 <include syntax="self" collection="type" />
555654 </subscopes>
556655 </scope>
@@ -562,7 +661,7 @@
562661 </scope>
563662 <include syntax="self" collection="type-list" />
564663 <scope>
565− <expression>(([A-Z](\w|')*\.)*)'*\!?([A-Z](\w|')*)</expression>
664+ <expression>(([A-Z](\w|')*\.)*)'*([A-Z](\w|')*)</expression>
566665 <capture number="1" name="haskell.identifier.package.module" />
567666 <capture number="4" name="haskell.identifier.type" />
568667 </scope>
@@ -570,7 +669,13 @@
570669 <expression>forall</expression>
571670 </scope>
572671 <scope name="haskell.identifier.type.variable">
573− <expression>(?!where)(?!=)((?!(\(|\)|\,|\!))\S)((?!(\(|\)|\,))\w)*</expression>
672+ <expression>(?!=)((?!(\(|\)|\,))\S)((?!(\(|\)|\,))\S)*</expression>
673+ </scope>
674+ <scope name="haskell.keyword.construct.function-arrow">
675+ <expression>-&gt;</expression>
676+ </scope>
677+ <scope name="haskell.keyword.construct.fat-arrow">
678+ <expression>=&gt;</expression>
574679 </scope>
575680 </collection>
576681
@@ -585,7 +690,6 @@
585690 <template>^(?!\s+\1\S)(?!\s*$)</template>
586691 </ends-with>
587692 <subscopes>
588− <include syntax="self" collection="comments" />
589693 <scope name="haskell.keyword.construct.where">
590694 <expression>where</expression>
591695 </scope>
@@ -605,7 +709,6 @@
605709 <capture number="1" name="haskell.type-list.bracket" />
606710 </ends-with>
607711 <subscopes>
608− <include syntax="self" collection="comments" />
609712 <include syntax="self" collection="type" />
610713 </subscopes>
611714 </scope>
@@ -622,7 +725,6 @@
622725 <capture number="1" name="haskell.keyword.construct.lambda" />
623726 </ends-with>
624727 <subscopes>
625− <include syntax="self" collection="comments" />
626728 <include syntax="self" collection="pattern-match" />
627729 </subscopes>
628730 </scope>
@@ -636,6 +738,7 @@
636738
637739 <collection name="where-clause">
638740 <scope name="haskell.construct.where">
741+ <local scope="within-parent" />
639742 <starts-with>
640743 <expression>^(\h*)(where)</expression>
641744 <capture number="2" name="haskell.construct.keyword.where" />
@@ -644,7 +747,6 @@
644747 <template>^(?!\1\s*\S)(?!s*$)</template>
645748 </ends-with>
646749 <subscopes>
647− <include syntax="self" collection="comments" />
648750 <include syntax="self" collection="definition" />
649751 </subscopes>
650752 </scope>
@@ -684,12 +786,12 @@
684786
685787
686788 <collection name="strings">
687− <scope name="haskell.string.double-quoted" spell-check="true">
789+ <scope name="haskell.string.double-quoted">
688790 <starts-with>
689− <expression>&quot;</expression>
791+ <expression>"</expression>
690792 </starts-with>
691793 <ends-with>
692− <expression>&quot;</expression>
794+ <expression>"</expression>
693795 </ends-with>
694796 <subscopes>
695797 <scope name="haskell.string.escape-sequences">
@@ -726,7 +828,6 @@
726828 </ends-with>
727829 <subscopes>
728830 <scope name="identifier.haskell.type">
729− <symbol type="expression" />
730831 <symbol type="expression" />
731832 <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
732833 <capture number="1" name="identifier.type" />
@@ -751,7 +852,6 @@
751852 </ends-with>
752853 <subscopes>
753854 <scope name="haskell.construct.qualified">
754− <symbol type="expression" />
755855 <expression>qualified</expression>
756856 <capture number="0" name="haskell.construct.keyword.qualified" />
757857 </scope>
@@ -769,7 +869,6 @@
769869 </ends-with>
770870 <subscopes anchored="true">
771871 <include syntax="self" collection="import-list" />
772− <symbol type="expression" />
773872 </subscopes>
774873 </scope>
775874
@@ -803,7 +902,6 @@
803902 </ends-with>
804903 <subscopes>
805904 <scope name="haskell.identifier.struct">
806− <symbol type="expression" />
807905 <symbol type="reference" scope="local" />
808906 <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
809907 <capture number="1" name="haskell.import-list.identifier.type.name" />
@@ -817,6 +915,13 @@
817915 </scope>
818916 </collection>
819917
918+ <!-- <collection name="special">
919+ <scope>
920+ <expression>(;|,)</expression>
921+ </scope>
922+ </collection> -->
923+
924+
820925 <collection name="reservedop">
821926 <scope name="keyword.operator">
822927 <expression>(\.\.|:|::|=|\\|\||&lt;-|-&gt;|@|~|=>)</expression>
@@ -824,11 +929,10 @@
824929 </collection>
825930
826931 <collection name="keywords">
827− <scope name="haskell.keyword.self">
932+ <scope name="haskell.keyword.modifier">
828933 <symbol type="keyword" />
829934 <strings>
830935 <string>do</string>
831− <string>mdo</string>
832936 <string>in</string>
833937 <string>infix</string>
834938 <string>infixl</string>
@@ -866,18 +970,20 @@
866970 <strings>
867971 <string>undefined</string>
868972 <string>_</string>
869− <string>@</string>
870973 </strings>
871974 </scope>
872975 </collection>
873976
874977 <collection name="comments">
875978 <scope name="haskell.comment.single" spell-check="true">
876− <symbol type="comment" />
877− <expression> --.*$</expression>
979+ <starts-with>
980+ <expression>--</expression>
981+ </starts-with>
982+ <ends-with>
983+ <expression>$</expression>
984+ </ends-with>
878985 </scope>
879986 <scope name="haskell.comment.block" spell-check="true">
880− <symbol type="comment" />
881987 <starts-with>
882988 <expression>{-</expression>
883989 </starts-with>
@@ -889,4 +995,4 @@
889995
890996
891997 </collections>
892−</syntax>
998+</syntax>
Haskell Language Server.novaextension/extension.json+159−200
@@ -6,333 +6,292 @@
66 "version": "1.0",
77 "categories": ["languages", "formatters"],
88 "main": "main.js",
9− "entitlements":
10− {
9+ "entitlements": {
1110 "process": true,
1211 "filesystem": "readwrite",
1312 "requests": true
1413 },
15− "configWorkspace": [
16− {
14+ "configWorkspace": [{
1715 "key": "haskell-language-server-path",
1816 "title": "Haskell Language Server path",
1917 "description": "If you want to use a custom HLS build for this project, then specify the path to it here.",
2018 "type": "path",
2119 "placeholder": "/usr/local/bin/example"
22− },
23− {
24− "key": "env-generator",
25− "title": "Environment generator",
26− "description": "You can specify a shell command which will be used to generate the environment, in which the extension will be executes. This is useful if you want to utilize `nix-shell`, `direnv` or any similar command.\n\nExpects the command to have the same stdout as the `env` command.",
27− "type": "enum",
28− "allowsCustom": true,
29− "values": ["nix-shell --run env", "direnv exec env"]
30− },
31− {
20+ }, {
3221 "type": "section",
3322 "title": "Haskell Language Server settings",
34− "description":"Some of the features are not supported in Nova. Some of them are explicitly marked as not supported, but it is not exhaustive.",
35− "children": [
36− {
37− "key": "haskell.formattingProvider",
38− "title": "Code formatter",
39− "type": "enum",
40− "values": [
41− "brittany",
42− "floskell",
43− "fourmolu",
44− "ormolu",
45− "stylish-haskell",
46− "none"
47− ],
48− "default": "ormolu",
49− "description": "The formatter to use when formatting a document or range. Ensure the plugin is enabled."
50− },
51− {
52− "key": "haskell.checkProject",
53− "title": "Check whole project",
54− "type": "boolean",
55− "default": false,
56− "description": "Whether to typecheck the entire project on load. It could lead to bad perfomance in large projects."
57− },
58− {
59− "title": "Completions",
23+ "children": [{
24+ "key": "haskell.formattingProvider",
25+ "title": "Code formatter",
26+ "type": "enum",
27+ "values": [
28+ "brittany",
29+ "floskell",
30+ "fourmolu",
31+ "ormolu",
32+ "stylish-haskell",
33+ "none"
34+ ],
35+ "default": "ormolu",
36+ "description": "The formatter to use when formatting a document or range. Ensure the plugin is enabled."
37+ }, {
38+ "key": "haskell.checkProject",
39+ "title": "Check whole project",
40+ "type": "boolean",
41+ "default": false,
42+ "description": "Whether to typecheck the entire project on load. It could drive to bad perfomance in large projects."
43+ }, {
44+ "key": "haskell.maxCompletions",
45+ "type": "number",
46+ "title": "Maximum number of completions",
47+ "description": "Maximum number of completions sent to the editor.",
48+ "default": 40
49+ }, {
50+ "type": "section",
51+ "title": "Plugin settings",
52+ "children": [{
6053 "type": "section",
61− "children": [
62− {
63− "key": "haskell.plugin.ghcide-completions.config.autoExtendOn",
64− "title": "Extend with out-of-scope identifiers",
65− "description": "Extends the import list automatically when completing a out-of-scope identifier",
54+ "title": "Import lens",
55+ "description": "Not currently implemented in Nova",
56+ "children": [{
57+ "key": "haskell.plugin.importLens.codeActionsOn",
58+ "title": "Enable code actions",
59+ "type": "boolean",
6660 "default": true,
67− "type": "boolean"
68− },
69− {
70− "key": "haskell.plugin.ghcide-completions.config.snippetsOn",
71− "title": "Insert snippets",
72− "description": "Inserts snippets when using code completions",
61+ "description": "Enables explicit imports code actions"
62+ }, {
63+ "key": "haskell.plugin.importLens.codeLensOn",
64+ "title": "Enable code lens",
65+ "type": "boolean",
7366 "default": true,
74− "type": "boolean"
75− },
76− {
77− "key": "haskell.maxCompletions",
78− "type": "number",
79− "title": "Maximum number of completions",
80− "description": "Maximum number of completions sent to the editor.",
81− "default": 40
67+ "description": "Enables explicit imports code lenses"
8268 }]
83− },
84− {
69+ }, {
8570 "title": "HLint",
8671 "type": "section",
87− "children": [
88− {
72+ "children": [{
8973 "key": "haskell.plugin.hlint.codeActionsOn",
9074 "title": "Enable code actions",
9175 "type": "boolean",
9276 "default": true,
9377 "description": "Enables hlint code actions (apply hints)"
94− },
95− {
78+ }, {
9679 "key": "haskell.plugin.hlint.diagnosticsOn",
9780 "title": "Enable diagnostics",
9881 "type": "boolean",
9982 "default": true,
10083 "description": "Enables hlint diagnostics"
101− },
102− {
103− "key": "haskell.plugin.hlint.config.flags",
104− "title": "Flags",
105− "description": "Flags used by hlint",
106− "default": [],
107− "type": "stringArray"
108− }]
109− },
110− {
111− "type": "section",
112− "title": "Import lens",
113− "description": "Not currently implemented in Nova",
114− "children": [
115− {
116− "key": "haskell.plugin.importLens.codeActionsOn",
117− "title": "Enable code actions",
118− "type": "boolean",
119− "default": true,
120− "description": "Enables explicit imports code actions"
121− },
122− {
123− "key": "haskell.plugin.importLens.codeLensOn",
124− "title": "Enable code lens",
125− "type": "boolean",
126− "default": true,
127− "description": "Enables explicit imports code lenses"
84+ }, {
85+ "title": "Configuration",
86+ "type": "section",
87+ "children": [{
88+ "key": "haskell.plugin.hlint.config.flags",
89+ "title": "Flags",
90+ "description": "Flags used by hlint",
91+ "default": [],
92+ "type": "stringArray"
93+ }]
12894 }]
129− },
130−
131− {
95+ }, {
13296 "title": "Eval",
13397 "type": "section",
134− "children": [
135− {
98+ "children": [{
13699 "key": "haskell.plugin.eval.globalOn",
137100 "title": "Enable",
138101 "type": "boolean",
139102 "default": true,
140103 "description": "Enables eval plugin"
141104 }]
142− },
143− {
105+ }, {
144106 "title": "Module name",
145107 "type": "section",
146− "children": [
147− {
108+ "children": [{
148109 "key": "haskell.plugin.moduleName.globalOn",
149110 "title": "Enable",
150111 "type": "boolean",
151112 "default": true,
152113 "description": "Enables module name plugin"
153114 }]
154− },
155− {
115+ }, {
156116 "title": "Splice",
157117 "type": "section",
158− "children": [
159− {
118+ "children": [{
160119 "key": "haskell.plugin.splice.globalOn",
161120 "title": "Enable",
162121 "type": "boolean",
163122 "default": true,
164123 "description": "Enables splice plugin (expand template haskell definitions)"
165124 }]
166− },
167− {
125+ }, {
168126 "title": "Haddock comments",
169127 "type": "section",
170− "children": [
171− {
128+ "children": [{
172129 "key": "haskell.plugin.haddockComments.globalOn",
173130 "title": "Enable",
174131 "type": "boolean",
175132 "default": true,
176133 "description": "Enables haddock comments plugin"
177134 }]
178− },
179− {
135+ }, {
180136 "title": "Class",
181137 "type": "section",
182− "children": [
183− {
138+ "children": [{
184139 "key": "haskell.plugin.class.globalOn",
185140 "title": "Enable",
186141 "type": "boolean",
187142 "default": true,
188143 "description": "Enables type class plugin"
189144 }]
190− },
191− {
145+ }, {
192146 "title": "Retrie",
193147 "type": "section",
194− "children": [
195− {
148+ "children": [{
196149 "key": "haskell.plugin.retrie.globalOn",
197150 "title": "Enable",
198151 "type": "boolean",
199152 "default": true,
200153 "description": "Enables retrie plugin"
201154 }]
202− },
203− {
155+ }, {
204156 "title": "Wingman",
205157 "type": "section",
206− "children": [
207− {
158+ "children": [{
208159 "key": "haskell.plugin.tactics.globalOn",
209160 "title": "Enable",
210161 "type": "boolean",
211162 "default": true,
212163 "description": "Enables Wingman (tactics) plugin"
213− },
214− {
215− "key": "haskell.plugin.tactics.config.auto_gas",
216− "title": "Gas",
217− "description": "The depth of the search tree when performing \"Attempt to fill hole\". Bigger values will be able to derive more solutions, but will take exponentially more time.",
218− "default": 4,
219− "type": "number"
220− },
221− {
222− "key": "haskell.plugin.tactics.config.hole_severity",
223− "title": "Hole severity",
224− "description": "The severity to use when showing hole diagnostics.",
225− "values": [
226− 1,
227− 2,
228− 3,
229− 4,
230− null
231− ],
232− "default": null,
233− "type": "enum"
234− },
235− {
236− "key": "haskell.plugin.tactics.config.max_use_ctor_actions",
237− "title": "Max number of constructors",
238− "type": "number",
239− "default": 5,
240− "description": "Maximum number of `Use constructor <x>` code actions that can appear"
241− },
242− {
243− "key": "haskell.plugin.tactics.config.timeout_duration",
244− "title": "Timeout",
245− "description": "The timeout for Wingman actions, in seconds",
246− "default": 2,
247− "type": "number"
248− },
249− {
250− "key": "haskell.plugin.tactics.config.proofstate_styling",
251− "title": "Proof states",
252− "description": "Should Wingman emit styling markup when showing metaprogram proof states?",
253− "default": true,
254− "type": "boolean"
164+ }, {
165+ "title": "Configuration",
166+ "type": "section",
167+ "children": [{
168+ "key": "haskell.plugin.tactics.config.auto_gas",
169+ "title": "Gas",
170+ "description": "The depth of the search tree when performing \"Attempt to fill hole\". Bigger values will be able to derive more solutions, but will take exponentially more time.",
171+ "default": 4,
172+ "type": "number"
173+ }, {
174+ "key": "haskell.plugin.tactics.config.hole_severity",
175+ "title": "Hole severity",
176+ "description": "The severity to use when showing hole diagnostics.",
177+ "values": [
178+ 1,
179+ 2,
180+ 3,
181+ 4,
182+ null
183+ ],
184+ "default": null,
185+ "type": "enum"
186+ }, {
187+ "key": "haskell.plugin.tactics.config.max_use_ctor_actions",
188+ "title": "Max number of constructors",
189+ "type": "number",
190+ "default": 5,
191+ "description": "Maximum number of `Use constructor <x>` code actions that can appear"
192+ }, {
193+ "key": "haskell.plugin.tactics.config.timeout_duration",
194+ "title": "Timeout",
195+ "description": "The timeout for Wingman actions, in seconds",
196+ "default": 2,
197+ "type": "number"
198+ }, {
199+ "key": "haskell.plugin.tactics.config.proofstate_styling",
200+ "title": "Proof states",
201+ "description": "Should Wingman emit styling markup when showing metaprogram proof states?",
202+ "default": true,
203+ "type": "boolean"
204+ }]
255205 }]
256− },
257− {
206+ }, {
258207 "title": "Pragmas",
259208 "type": "section",
260− "children": [
261− {
209+ "children": [{
262210 "key": "haskell.plugin.pragmas.codeActionsOn",
263211 "title": "Enable code actions",
264212 "type": "boolean",
265213 "default": true,
266214 "description": "Enables pragmas code actions"
267− },
268− {
215+ }, {
269216 "key": "haskell.plugin.pragmas.completionOn",
270217 "title": "Enable completions",
271218 "type": "boolean",
272219 "default": true,
273220 "description": "Enables pragmas completions"
274221 }]
275− },
276− {
277− "title": "Type lenses",
222+ }, {
223+ "title": "Completions",
224+ "type": "section",
225+ "children": [{
226+ "title": "Configuration",
227+ "type": "section",
228+ "children": [{
229+ "key": "haskell.plugin.ghcide-completions.config.autoExtendOn",
230+ "title": "Extend with out-of-scope identifiers",
231+ "description": "Extends the import list automatically when completing a out-of-scope identifier",
232+ "default": true,
233+ "type": "boolean"
234+ }, {
235+ "key": "haskell.plugin.ghcide-completions.config.snippetsOn",
236+ "title": "Insert snippets",
237+ "description": "Inserts snippets when using code completions",
238+ "default": true,
239+ "type": "boolean"
240+ }]
241+ }]
242+ }, {
278243 "description": "Not currently implemented in Nova",
279244 "type": "section",
280− "children": [
281− {
245+ "children": [{
282246 "key": "haskell.plugin.ghcide-type-lenses.globalOn",
283247 "title": "Enable",
284248 "type": "boolean",
285249 "default": true,
286250 "description": "Enables type lenses plugin"
287− },
288− {
289− "key": "haskell.plugin.ghcide-type-lenses.config.mode",
290− "title": "Mode",
291− "type": "enum",
292− "default": true,
293− "description": "Control how type lenses are shown",
294− "values": ["always", "exported", "diagnostics"]
251+ }, {
252+ "title": "Configuration",
253+ "type": "section",
254+ "children": [{
255+ "key": "haskell.plugin.ghcide-type-lenses.config.mode",
256+ "title": "Mode",
257+ "type": "enum",
258+ "default": true,
259+ "description": "Control how type lenses are shown",
260+ "values": ["always", "exported", "diagnostics"]
261+ }]
295262 }]
296− },
297− {
263+ }, {
298264 "title": "Refine imports",
299265 "type": "section",
300− "children": [
301− {
266+ "children": [{
302267 "key": "haskell.plugin.refineImports.globalOn",
303268 "title": "Enable",
304269 "type": "boolean",
305270 "default": true,
306271 "description": "Enables refine imports plugin"
307272 }]
308− }
309− ]
273+ }]
274+ }]
310275 }],
311276 "activationEvents": ["onLanguage:haskell", "onLanguage:hs"],
312− "commands":
313− {
314− "editor": [
315− {
277+ "commands": {
278+ "editor": [{
316279 "title": "Format file with Haskell Language Server",
317280 "command": "format",
318281 "when": "editorSyntax == 'haskell' && editorHasFocus",
319− "filters":
320− {
282+ "filters": {
321283 "syntaxes": ["haskell"]
322284 }
323285 }],
324− "extensions": [
325− {
286+ "extensions": [{
326287 "title": "Stop",
327288 "paletteTitle": "Stop Haskell Language Server",
328289 "command": "stop"
329− },
330− {
290+ }, {
331291 "title": "Restart",
332292 "paletteTitle": "Restart Haskell Language Server",
333293 "command": "restart"
334− },
335− {
294+ }, {
336295 "title": "Clear cached versions",
337296 "paletteTitle": "Clear cached versions of Haskell Language Server",
338297 "command": "clear-cache"