git.iko.soy/haskell-nova
on 0d7f086 help sign in
7882415
swap
0 ahead, 11 behind
5 files changed+390−433
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+223−94 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+223−94
@@ -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,54 @@
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>
82+ <scope>
83+ <expression></expression>
8884 </scope>
89− <include syntax="self" collection="keywords" />
85+ <include syntax="self" collection="do-bind" />
9086 <include syntax="self" collection="literal" />
9187 <include syntax="self" collection="operators" />
92− <include syntax="self" collection="record-match" />
9388 <include syntax="self" collection="list" />
94− <include syntax="self" collection="view-pattern" />
9589 <include syntax="self" collection="lambda-case" />
9690 <include syntax="self" collection="lambda-head" />
97− <include syntax="self" collection="case-expression" />
98− <include syntax="self" collection="qconid" />
91+ <include syntax="self" collection="type-applications" />
92+ <include syntax="self" collection="outer-case-expression" />
9993 <include syntax="self" collection="qvarid" />
10094 <include syntax="self" collection="tuple" />
95+
96+
97+ <!-- Needed for do binds -->
98+ <!-- <include syntax="self" collection="pattern-match" /> -->
99+ </collection>
100+
101+ <collection name="pattern-match">
102+ <include syntax="self" collection="literal" />
103+ <include syntax="self" collection="tuple-match" />
104+ <!-- <include syntax="self" collection="at-pattern" /> -->
105+ <include syntax="self" collection="varid" />
106+ <include syntax="self" collection="qconid" />
107+ <include syntax="self" collection="record-match" />
108+ <include syntax="self" collection="list-pattern" />
109+ <include syntax="self" collection="view-pattern" />
110+ </collection>
111+
112+ <collection name="type-applications">
113+ <scope name="type-applications">
114+ <starts-with>
115+ <expression>(\s@)\(</expression>
116+ <capture number="1" name="haskell.keyword.operator.typeapplication" />
117+ </starts-with>
118+ <ends-with>
119+ <expression>)</expression>
120+ </ends-with>
121+ <subscopes>
122+ <include syntax="self" collection="type" />
123+ </subscopes>
124+ </scope>
125+ <scope name="type-applications-single">
126+ <expression>(@)(\w+)</expression>
127+ <capture number="1" name="haskell.keyword.operator.typeapplication" />
128+ <capture number="2" name="haskell.identifier.type" />
129+ </scope>
101130 </collection>
102131
103132 <collection name="Quote">
@@ -136,8 +165,8 @@
136165 <capture number="1" name="haskell.pattern.record.bracket" />
137166 </ends-with>
138167 <subscopes>
139− <include syntax="self" collection="comments" />
140− <include syntax="self" collection="expressions" />
168+ <include syntax="self" collection="pattern-match" />
169+ <include syntax="self" collection="varid" />
141170 <scope name="record-sep">
142171 <expression>=</expression>
143172 </scope>
@@ -159,7 +188,6 @@
159188 <capture number="1" name="haskell.pattern.record.bracket" />
160189 </ends-with>
161190 <subscopes>
162− <include syntax="self" collection="comments" />
163191 <scope name="haskell.pattern.record.wildcard">
164192 <expression>\.\.</expression>
165193 </scope>
@@ -186,12 +214,29 @@
186214 <capture number="1" name="haskell.list.bracket" />
187215 </ends-with>
188216 <subscopes>
189− <include syntax="self" collection="comments" />
190217 <include syntax="self" collection="expressions" />
191218 </subscopes>
192219 </scope>
193220 </collection>
194221
222+ <collection name="list-pattern">
223+ <symbol type="expression" />
224+ <scope name="haskell.pattern.list">
225+ <starts-with>
226+ <expression>(\[)</expression>
227+ <capture number="1" name="haskell.pattern.list.bracket" />
228+ </starts-with>
229+ <ends-with>
230+ <expression>(\])</expression>
231+ <capture number="1" name="haskell.pattern.list.bracket" />
232+ </ends-with>
233+ <subscopes>
234+ <include syntax="self" collection="pattern-match" />
235+ </subscopes>
236+ </scope>
237+ </collection>
238+
239+
195240 <collection name="view-pattern">
196241 <scope name="haskell.pattern.view">
197242 <symbol type="expression" />
@@ -208,7 +253,24 @@
208253 <scope name="haskell.pattern.view.operator.arrow">
209254 <expression>-&gt;</expression>
210255 </scope>
211− <include syntax="self" collection="expressions" />
256+ <include syntax="self" collection="pattern-match" />
257+ </subscopes>
258+ </scope>
259+ </collection>
260+
261+ <collection name="tuple-match">
262+ <symbol type="expression" />
263+ <scope name="haskell.pattern.tuple">
264+ <starts-with>
265+ <expression>(\()</expression>
266+ <capture number="1" name="haskell.pattern.tuple.bracket" />
267+ </starts-with>
268+ <ends-with>
269+ <expression>(\))</expression>
270+ <capture number="1" name="haskell.pattern.tuple.bracket" />
271+ </ends-with>
272+ <subscopes>
273+ <include syntax="self" collection="pattern-match" />
212274 </subscopes>
213275 </scope>
214276 </collection>
@@ -224,11 +286,53 @@
224286 <capture number="1" name="haskell.case.keyword.condition" />
225287 </ends-with>
226288 <subscopes anchored="true">
289+ <include syntax="self" collection="pattern-match" />
290+ </subscopes>
291+ </scope>
292+ </collection>
293+
294+ <collection name="case-match">
295+ <scope name="case-match">
296+ <starts-with>
297+ <expression>(?=((\h*)\S.*-&gt;($|\h)))</expression>
298+ </starts-with>
299+ <ends-with>
300+ <expression>-&gt;</expression>
301+ </ends-with>
302+ <subscopes anchored="true">
303+ <include syntax="self" collection="pattern-match" />
304+ </subscopes>
305+ </scope>
306+ </collection>
307+
308+ <collection name="inner-case-expressions">
309+ <scope name="inner-case-expressions">
310+ <starts-with>
311+ <expression>(?=((\h*)\S.*-&gt;($|\h)))</expression>
312+ </starts-with>
313+ <ends-with>
314+ <template>^(?!\1)(?!\2\h)(?!\s*$)</template>
315+ </ends-with>
316+ <subscopes anchored="true" skip-whitespace="false">
317+ <include syntax="self" collection="case-match" />
227318 <include syntax="self" collection="expressions" />
228319 </subscopes>
229320 </scope>
230321 </collection>
231322
323+ <collection name="outer-case-expression">
324+ <scope name="outer-case-expression">
325+ <starts-with>
326+ <expression>(?=case)</expression>
327+ </starts-with>
328+ <ends-with />
329+ <subscopes anchored="true" skip-whitespace="false">
330+ <include syntax="self" collection="case-expression" />
331+ <include syntax="self" collection="inner-case-expressions" repeat="true" />
332+ </subscopes>
333+ </scope>
334+ </collection>
335+
232336 <collection name="tuple">
233337 <symbol type="expression" />
234338 <scope name="haskell.tuple">
@@ -241,73 +345,73 @@
241345 <capture number="1" name="haskell.tuple.bracket" />
242346 </ends-with>
243347 <subscopes>
244− <include syntax="self" collection="comments" />
245348 <include syntax="self" collection="expressions" />
246349 </subscopes>
247350 </scope>
248351 </collection>
249352
250353 <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>
354+ <symbol type="interface" />
355+ <scope name="haskell.definition.class">
255356 <starts-with>
256357 <expression>^(\h*)(class)($|\h)</expression>
257358 <capture number="2" name="haskell.keyword.construct.class" />
258359 </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">
360+ <ends-with>
361+ <template>^(?!\s+\1\S)(?!\s*$)</template>
362+ </ends-with>
363+ <subscopes>
364+ <scope name="haskell.keyword.construct.where">
274365 <expression>where</expression>
275366 </scope>
367+ <include syntax="self" collection="type" />
368+ <include syntax="self" collection="type-definition" />
369+ <!-- <include syntax="self" collection="type-annotation" /> -->
370+ <include syntax="self" collection="definition" />
276371 </subscopes>
277372 </scope>
278373 </collection>
279374
280375 <collection name="instance">
281376 <scope name="haskell.instance">
282− <symbol type="category" name-selector="haskell.keyword.construct.instance.name">
377+ <symbol type="category">
283378 <context behavior="whitespace" foldable="true" />
284379 </symbol>
285380 <starts-with>
286381 <expression>^(\h*)(instance)($|\h)</expression>
287382 <capture number="2" name="haskell.keyword.construct.instance" />
288383 </starts-with>
289− <ends-with />
290− <subscopes anchored="true">
291− <scope name="haskell.keyword.construct.instance.name">
384+ <ends-with>
385+ <template>^(?!\s+\1\S)(?!\s*$)</template>
386+ </ends-with>
387+ <subscopes anchored="true" skip-whitespace="false">
388+ <scope name="haskell.construct.instance.head">
292389 <starts-with>
293390 <expression></expression>
294391 </starts-with>
295392 <ends-with>
296− <expression>(?=(where|^\s*$))</expression>
393+ <expression>where</expression>
394+ <capture number="0" name="haskell.keyword.construct.where" />
297395 </ends-with>
298396 <subscopes>
299− <include syntax="self" collection="type" />
397+ <include syntax="self" collection="type" optional="true" repeat="true" />
300398 </subscopes>
301399 </scope>
302− <scope name="haskell.keyword.construct.where" optional="true">
303− <expression>where</expression>
304− </scope>
400+ <include syntax="self" collection="instance-body" />
305401 </subscopes>
306402 </scope>
307403 </collection>
308404
405+ <collection name="instance-body">
406+ <include syntax="self" collection="definition" />
407+ <include syntax="self" collection="type-definition" />
408+ </collection>
409+
309410 <collection name="type-family-definition">
310411 <scope name="haskell.definition.type-family.type">
412+ <symbol type="type" scope="global">
413+ <context behavior="subtree" foldable="false" />
414+ </symbol>
311415 <starts-with>
312416 <expression>^(\h*)(type\h+family)</expression>
313417 <capture number="2" name="haskell.keyword.construct.type-family" />
@@ -346,7 +450,6 @@
346450 <template>^(?!\s+\1\S)(?!\s*$)</template>
347451 </ends-with>
348452 <subscopes>
349− <include syntax="self" collection="comments" />
350453 <include syntax="self" collection="type" optional="true" repeat="true" />
351454 <scope>
352455 <expression>=</expression>
@@ -358,7 +461,7 @@
358461
359462 <collection name="definition">
360463 <scope name="haskell.definition.type.function">
361− <symbol type="function">
464+ <symbol type="function" scope="local">
362465 <context behavior="whitespace" foldable="true" />
363466 </symbol>
364467 <starts-with>
@@ -370,15 +473,53 @@
370473 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
371474 </ends-with>
372475 <subscopes>
373− <include syntax="self" collection="comments" />
374476 <include syntax="self" collection="type-annotation" />
375477 <include syntax="self" collection="implementation" />
376478 </subscopes>
377479 </scope>
378480 </collection>
379481
482+ <collection name="do-bind">
483+ <scope name="do-bind">
484+ <symbol>
485+ <context behavior="whitespace"></context>
486+ </symbol>
487+ <starts-with>
488+ <expression>^(?=((\h*)\S.+&lt;-($|\h)))</expression>
489+ </starts-with>
490+ <ends-with>
491+ <template>^(?!\1)(?!\2\h)(?!\s*$)</template>
492+ </ends-with>
493+ <subscopes>
494+ <include syntax="self" collection="do-pattern" />
495+ <include syntax="self" collection="expressions" />
496+ <!-- <scope name="bind-arrow">
497+ <expression>&lt;-</expression>
498+ </scope> -->
499+ </subscopes>
500+ </scope>
501+ </collection>
502+
503+ <collection name="do-pattern">
504+ <scope name="do-pattern">
505+ <starts-with>
506+ <expression>^(?=((\h*)\S.+&lt;-($|\h)))</expression>
507+ </starts-with>
508+ <ends-with>
509+ <expression>&lt;-</expression>
510+ </ends-with>
511+ <subscopes>
512+ <include syntax="self" collection="pattern-match" />
513+ <!-- <scope name="bind-arrow">
514+ <expression>&lt;-</expression>
515+ </scope>
516+ <include syntax="self" collection="expressions" repeat="true" /> -->
517+ </subscopes>
518+ </scope>
519+ </collection>
520+
380521 <collection name="implementation">
381− <scope name="haskell.definition.type.function.implementation">
522+ <scope name="haskell.definition.type.function">
382523 <starts-with>
383524 <expression>^(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h)</expression>
384525 <capture number="2" name="haskell.keyword.construct.default" />
@@ -387,8 +528,7 @@
387528 <ends-with>
388529 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
389530 </ends-with>
390− <subscopes>
391− <include syntax="self" collection="comments" />
531+ <subscopes anchored="true">
392532 <include syntax="self" collection="pattern-match" optional="true" repeat="true" />
393533 <scope>
394534 <expression>=</expression>
@@ -401,7 +541,7 @@
401541 </collection>
402542
403543 <collection name="type-annotation">
404− <scope name="haskell.definition.type.function.type-signature">
544+ <scope name="haskell.definition.type.function">
405545 <starts-with>
406546 <expression>^(\h*)`?(\w(\w|')*)`?\h*::($|\h)</expression>
407547 <capture number="2" name="haskell.identifier.function" />
@@ -410,7 +550,6 @@
410550 <template>^(?!\s+\1\S)(?!\s*$)</template>
411551 </ends-with>
412552 <subscopes>
413− <include syntax="self" collection="comments" />
414553 <include syntax="self" collection="type" />
415554 </subscopes>
416555 </scope>
@@ -430,7 +569,6 @@
430569 <template>^(?!\s+\1\S)(?!\s*$)</template>
431570 </ends-with>
432571 <subscopes>
433− <include syntax="self" collection="comments" />
434572 <include syntax="self" collection="type" />
435573 </subscopes>
436574 </scope>
@@ -450,7 +588,6 @@
450588 <template>^(?!\s+\1\S)(?!\s*$)</template>
451589 </ends-with>
452590 <subscopes>
453− <include syntax="self" collection="comments" />
454591 <scope name="haskell.keyword.construct.where">
455592 <expression>where</expression>
456593 </scope>
@@ -466,16 +603,15 @@
466603 <collection name="gadt-constructor">
467604 <scope name="haskell.identifier.type.struct.data.constructor">
468605 <symbol type="constructor">
469− <context behavior="subtree" foldable="true" />
606+ <context behavior="whitespace" />
470607 </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>
608+ <expression>(^|=|\|)\h+([A-Z](\w|')*)</expression>
609+ <capture number="2" name="haskell.identifier.data.name" />
610+ </scope>
611+ <scope name="identifier.type.struct.GADT.constructor">
612+ <symbol type="constructor"></symbol>
613+ <expression>^\h+([A-Z](\w|')*)</expression>
614+ <capture number="1" name="haskell.identifier.data.name" />
479615 </scope>
480616 </collection>
481617
@@ -483,10 +619,6 @@
483619 <scope name="haskell.record.construct.deriving.keyword">
484620 <expression>deriving(\h+(newtype|stock|anyclass))?</expression>
485621 </scope>
486− <scope name="haskell.record.construct.deriving.keyword">
487− <include syntax="self" collection="comments" />
488− <expression>via</expression>
489− </scope>
490622 </collection>
491623
492624 <collection name="record-definition">
@@ -503,7 +635,6 @@
503635 <capture number="1" name="haskell.record.bracket" />
504636 </ends-with>
505637 <subscopes>
506− <include syntax="self" collection="comments" />
507638 <include syntax="self" collection="record-definition-field-name" />
508639 <include syntax="self" collection="type" />
509640 </subscopes>
@@ -535,7 +666,6 @@
535666 <expression>\)</expression>
536667 </ends-with>
537668 <subscopes>
538− <include syntax="self" collection="comments" />
539669 <scope name="haskell.construct.type.typle.comma">
540670 <expression>\,</expression>
541671 </scope>
@@ -550,7 +680,6 @@
550680 <expression>\]</expression>
551681 </ends-with>
552682 <subscopes>
553− <include syntax="self" collection="comments" />
554683 <include syntax="self" collection="type" />
555684 </subscopes>
556685 </scope>
@@ -570,7 +699,7 @@
570699 <expression>forall</expression>
571700 </scope>
572701 <scope name="haskell.identifier.type.variable">
573− <expression>(?!where)(?!=)((?!(\(|\)|\,|\!))\S)((?!(\(|\)|\,))\w)*</expression>
702+ <expression>(?!where)(?!=)((?!(\(|\)|\,|\!))\S)((?!(\(|\)|\,))\S)*</expression>
574703 </scope>
575704 </collection>
576705
@@ -585,7 +714,6 @@
585714 <template>^(?!\s+\1\S)(?!\s*$)</template>
586715 </ends-with>
587716 <subscopes>
588− <include syntax="self" collection="comments" />
589717 <scope name="haskell.keyword.construct.where">
590718 <expression>where</expression>
591719 </scope>
@@ -605,7 +733,6 @@
605733 <capture number="1" name="haskell.type-list.bracket" />
606734 </ends-with>
607735 <subscopes>
608− <include syntax="self" collection="comments" />
609736 <include syntax="self" collection="type" />
610737 </subscopes>
611738 </scope>
@@ -622,7 +749,6 @@
622749 <capture number="1" name="haskell.keyword.construct.lambda" />
623750 </ends-with>
624751 <subscopes>
625− <include syntax="self" collection="comments" />
626752 <include syntax="self" collection="pattern-match" />
627753 </subscopes>
628754 </scope>
@@ -644,7 +770,6 @@
644770 <template>^(?!\1\s*\S)(?!s*$)</template>
645771 </ends-with>
646772 <subscopes>
647− <include syntax="self" collection="comments" />
648773 <include syntax="self" collection="definition" />
649774 </subscopes>
650775 </scope>
@@ -684,12 +809,12 @@
684809
685810
686811 <collection name="strings">
687− <scope name="haskell.string.double-quoted" spell-check="true">
812+ <scope name="haskell.string.double-quoted">
688813 <starts-with>
689− <expression>&quot;</expression>
814+ <expression>"</expression>
690815 </starts-with>
691816 <ends-with>
692− <expression>&quot;</expression>
817+ <expression>"</expression>
693818 </ends-with>
694819 <subscopes>
695820 <scope name="haskell.string.escape-sequences">
@@ -726,7 +851,6 @@
726851 </ends-with>
727852 <subscopes>
728853 <scope name="identifier.haskell.type">
729− <symbol type="expression" />
730854 <symbol type="expression" />
731855 <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
732856 <capture number="1" name="identifier.type" />
@@ -751,7 +875,6 @@
751875 </ends-with>
752876 <subscopes>
753877 <scope name="haskell.construct.qualified">
754− <symbol type="expression" />
755878 <expression>qualified</expression>
756879 <capture number="0" name="haskell.construct.keyword.qualified" />
757880 </scope>
@@ -769,7 +892,6 @@
769892 </ends-with>
770893 <subscopes anchored="true">
771894 <include syntax="self" collection="import-list" />
772− <symbol type="expression" />
773895 </subscopes>
774896 </scope>
775897
@@ -803,7 +925,6 @@
803925 </ends-with>
804926 <subscopes>
805927 <scope name="haskell.identifier.struct">
806− <symbol type="expression" />
807928 <symbol type="reference" scope="local" />
808929 <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
809930 <capture number="1" name="haskell.import-list.identifier.type.name" />
@@ -817,6 +938,13 @@
817938 </scope>
818939 </collection>
819940
941+ <!-- <collection name="special">
942+ <scope>
943+ <expression>(;|,)</expression>
944+ </scope>
945+ </collection> -->
946+
947+
820948 <collection name="reservedop">
821949 <scope name="keyword.operator">
822950 <expression>(\.\.|:|::|=|\\|\||&lt;-|-&gt;|@|~|=>)</expression>
@@ -824,11 +952,10 @@
824952 </collection>
825953
826954 <collection name="keywords">
827− <scope name="haskell.keyword.self">
955+ <scope name="haskell.keyword.modifier">
828956 <symbol type="keyword" />
829957 <strings>
830958 <string>do</string>
831− <string>mdo</string>
832959 <string>in</string>
833960 <string>infix</string>
834961 <string>infixl</string>
@@ -866,18 +993,20 @@
866993 <strings>
867994 <string>undefined</string>
868995 <string>_</string>
869− <string>@</string>
870996 </strings>
871997 </scope>
872998 </collection>
873999
8741000 <collection name="comments">
8751001 <scope name="haskell.comment.single" spell-check="true">
876− <symbol type="comment" />
877− <expression> --.*$</expression>
1002+ <starts-with>
1003+ <expression>--</expression>
1004+ </starts-with>
1005+ <ends-with>
1006+ <expression>$</expression>
1007+ </ends-with>
8781008 </scope>
8791009 <scope name="haskell.comment.block" spell-check="true">
880− <symbol type="comment" />
8811010 <starts-with>
8821011 <expression>{-</expression>
8831012 </starts-with>
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"