git.iko.soy/haskell-nova
on master help sign in
swap
788241510 ahead, 0 behind
5 files changed+424−315
since splitsnapshots
unifiedsplit
Haskell Language Server.novaextension/Scripts/download.js+42−1 Haskell Language Server.novaextension/Scripts/main.js+5−6 Haskell Language Server.novaextension/Scripts/utils.js+92−1 Haskell Language Server.novaextension/Syntaxes/Haskell.xml+85−148 Haskell Language Server.novaextension/extension.json+200−159
Haskell Language Server.novaextension/Scripts/download.js+42−1
@@ -5,6 +5,8 @@ const {
55const {
66 readStream,
77 getStorage,
8+ call,
9+ hasCustomEnv
810} = require("utils");
911
1012exports.getHLS = getHLS;
@@ -43,6 +45,9 @@ async function downloadTool(name) {
4345 const storagePath = getStorageForTool(name);
4446 console.log("Downloading " + storagePath);
4547 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+ }
4651 const response = await fetch(urls[name]);
4752 if (!response.ok) {
4853 console.error(response.statusText);
@@ -128,7 +133,7 @@ async function getGHCVersion() {
128133 sendPermanentNotification(
129134 tool + " not installed!",
130135 "Please install " + tool +
131− " and restart Haskell Language Server.",
136+ " and restart Haskell Language Server.",
132137 );
133138 } else {
134139 sendPermanentNotification("Couldn't detect GHC version", x);
@@ -141,7 +146,28 @@ async function getGHCVersion() {
141146 return promise;
142147}
143148async 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+
144160 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+ }
145171 return await getTool(version);
146172}
147173
@@ -156,3 +182,18 @@ function getToolName(name) {
156182function notifyToolDownloading(name) {
157183 sendNotification("Downloading tool", "Downloading " + getToolName(name));
158184}
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+5−6
@@ -9,8 +9,9 @@ const {
99 getHLSConfig,
1010} = require("configuration");
1111const {
12− getFileName,
12+ getFileName, createEnv, getEnv
1313} = require("utils");
14+
1415exports.activate = function () {
1516 nova.commands.register("stop", (_workspace) => {
1617 stopServer();
@@ -107,10 +108,12 @@ function applyAllLSPEdits(edits, text) {
107108}
108109let lspClient = null;
109110async function startServer() {
111+ await createEnv()
110112 stopServer();
111113 const path = await getServerPath();
114+ const env = await getEnv()
112115 const serverOptions = {
113− path: path,
116+ path, env,
114117 args: ["lsp", "--cwd", nova.workspace.path],
115118 };
116119 const clientOptions = {
@@ -137,7 +140,3 @@ function stopServer() {
137140function getServerPath() {
138141 return getHLS();
139142}
140−
141−// function getLogPath() {
142−// return getStorage() + "/haskell-language-server.log";
143−// }
Haskell Language Server.novaextension/Scripts/utils.js+92−1
@@ -1,3 +1,8 @@
1+const {
2+ sendNotification,
3+ sendPermanentNotification,
4+} = require("notifications");
5+
16function readStream(readableStream) {
27 return new Promise((resolve, _reject) => {
38 const reader = readableStream.getReader();
@@ -48,4 +53,90 @@ function traceRaw(x) {
4853 return x;
4954}
5055
51−module.exports = { readStream, getStorage, getFileName, trace, traceRaw };
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+
Haskell Language Server.novaextension/Syntaxes/Haskell.xml+85−148
@@ -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,7 +57,6 @@
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" /> -->
6160 <include syntax="self" collection="GADT-definition" />
6261 <include syntax="self" collection="instance" />
6362 <include syntax="self" collection="typeclass" />
@@ -66,7 +65,6 @@
6665
6766 <template-scopes>
6867 <include syntax="self" collection="Quote" />
69− <include syntax="self" collection="comments" />
7068 </template-scopes>
7169
7270 <collections>
@@ -79,7 +77,16 @@
7977 </collection>
8078
8179 <collection name="expressions">
82− <include syntax="self" collection="do-bind" />
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" />
8390 <include syntax="self" collection="literal" />
8491 <include syntax="self" collection="operators" />
8592 <include syntax="self" collection="record-match" />
@@ -87,33 +94,12 @@
8794 <include syntax="self" collection="view-pattern" />
8895 <include syntax="self" collection="lambda-case" />
8996 <include syntax="self" collection="lambda-head" />
90− <include syntax="self" collection="type-applications" />
91− <include syntax="self" collection="outer-case-expression" />
97+ <include syntax="self" collection="case-expression" />
9298 <include syntax="self" collection="qconid" />
9399 <include syntax="self" collection="qvarid" />
94100 <include syntax="self" collection="tuple" />
95101 </collection>
96102
97− <collection name="type-applications">
98− <scope name="type-applications">
99− <starts-with>
100− <expression>(\s@)\(</expression>
101− <capture number="1" name="haskell.keyword.operator.typeapplication" />
102− </starts-with>
103− <ends-with>
104− <expression>)</expression>
105− </ends-with>
106− <subscopes>
107− <include syntax="self" collection="type" />
108− </subscopes>
109− </scope>
110− <scope name="type-applications-single">
111− <expression>(@)(\w+)</expression>
112− <capture number="1" name="haskell.keyword.operator.typeapplication" />
113− <capture number="2" name="haskell.identifier.type" />
114− </scope>
115− </collection>
116−
117103 <collection name="Quote">
118104 <scope name="haskell.quasiquote.string-template">
119105 <starts-with>
@@ -150,6 +136,7 @@
150136 <capture number="1" name="haskell.pattern.record.bracket" />
151137 </ends-with>
152138 <subscopes>
139+ <include syntax="self" collection="comments" />
153140 <include syntax="self" collection="expressions" />
154141 <scope name="record-sep">
155142 <expression>=</expression>
@@ -172,6 +159,7 @@
172159 <capture number="1" name="haskell.pattern.record.bracket" />
173160 </ends-with>
174161 <subscopes>
162+ <include syntax="self" collection="comments" />
175163 <scope name="haskell.pattern.record.wildcard">
176164 <expression>\.\.</expression>
177165 </scope>
@@ -198,6 +186,7 @@
198186 <capture number="1" name="haskell.list.bracket" />
199187 </ends-with>
200188 <subscopes>
189+ <include syntax="self" collection="comments" />
201190 <include syntax="self" collection="expressions" />
202191 </subscopes>
203192 </scope>
@@ -240,48 +229,6 @@
240229 </scope>
241230 </collection>
242231
243− <collection name="case-match">
244− <scope name="case-match">
245− <starts-with>
246− <expression>(?=((\h*)\S.*-&gt;($|\h)))</expression>
247− </starts-with>
248− <ends-with>
249− <expression>-&gt;</expression>
250− </ends-with>
251− <subscopes anchored="true">
252− <include syntax="self" collection="expressions" />
253− </subscopes>
254− </scope>
255− </collection>
256−
257− <collection name="inner-case-expressions">
258− <scope name="inner-case-expressions">
259− <starts-with>
260− <expression>(?=((\h*)\S.*-&gt;($|\h)))</expression>
261− </starts-with>
262− <ends-with>
263− <template>^(?!\1)(?!\2\h)(?!\s*$)</template>
264− </ends-with>
265− <subscopes anchored="true" skip-whitespace="false">
266− <include syntax="self" collection="case-match" />
267− <include syntax="self" collection="expressions" />
268− </subscopes>
269− </scope>
270− </collection>
271−
272− <collection name="outer-case-expression">
273− <scope name="outer-case-expression">
274− <starts-with>
275− <expression>(?=case)</expression>
276− </starts-with>
277− <ends-with />
278− <subscopes anchored="true" skip-whitespace="false">
279− <include syntax="self" collection="case-expression" />
280− <include syntax="self" collection="inner-case-expressions" repeat="true" />
281− </subscopes>
282− </scope>
283− </collection>
284−
285232 <collection name="tuple">
286233 <symbol type="expression" />
287234 <scope name="haskell.tuple">
@@ -294,73 +241,73 @@
294241 <capture number="1" name="haskell.tuple.bracket" />
295242 </ends-with>
296243 <subscopes>
244+ <include syntax="self" collection="comments" />
297245 <include syntax="self" collection="expressions" />
298246 </subscopes>
299247 </scope>
300248 </collection>
301249
302250 <collection name="typeclass">
303− <symbol type="interface" />
304− <scope name="haskell.definition.class">
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>
305255 <starts-with>
306256 <expression>^(\h*)(class)($|\h)</expression>
307257 <capture number="2" name="haskell.keyword.construct.class" />
308258 </starts-with>
309− <ends-with>
310− <template>^(?!\s+\1\S)(?!\s*$)</template>
311− </ends-with>
312− <subscopes>
313− <scope name="haskell.keyword.construct.where">
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">
314274 <expression>where</expression>
315275 </scope>
316− <include syntax="self" collection="type" />
317− <include syntax="self" collection="type-definition" />
318− <!-- <include syntax="self" collection="type-annotation" /> -->
319− <include syntax="self" collection="definition" />
320276 </subscopes>
321277 </scope>
322278 </collection>
323279
324280 <collection name="instance">
325281 <scope name="haskell.instance">
326− <symbol type="category">
282+ <symbol type="category" name-selector="haskell.keyword.construct.instance.name">
327283 <context behavior="whitespace" foldable="true" />
328284 </symbol>
329285 <starts-with>
330286 <expression>^(\h*)(instance)($|\h)</expression>
331287 <capture number="2" name="haskell.keyword.construct.instance" />
332288 </starts-with>
333− <ends-with>
334− <template>^(?!\s+\1\S)(?!\s*$)</template>
335− </ends-with>
336− <subscopes anchored="true" skip-whitespace="false">
337− <scope name="haskell.construct.instance.head">
289+ <ends-with />
290+ <subscopes anchored="true">
291+ <scope name="haskell.keyword.construct.instance.name">
338292 <starts-with>
339293 <expression></expression>
340294 </starts-with>
341295 <ends-with>
342− <expression>where</expression>
343− <capture number="0" name="haskell.keyword.construct.where" />
296+ <expression>(?=(where|^\s*$))</expression>
344297 </ends-with>
345298 <subscopes>
346− <include syntax="self" collection="type" optional="true" repeat="true" />
299+ <include syntax="self" collection="type" />
347300 </subscopes>
348301 </scope>
349− <include syntax="self" collection="instance-body" />
302+ <scope name="haskell.keyword.construct.where" optional="true">
303+ <expression>where</expression>
304+ </scope>
350305 </subscopes>
351306 </scope>
352307 </collection>
353308
354− <collection name="instance-body">
355− <include syntax="self" collection="definition" />
356− <include syntax="self" collection="type-definition" />
357− </collection>
358−
359309 <collection name="type-family-definition">
360310 <scope name="haskell.definition.type-family.type">
361− <symbol type="type" scope="global">
362− <context behavior="subtree" foldable="false" />
363− </symbol>
364311 <starts-with>
365312 <expression>^(\h*)(type\h+family)</expression>
366313 <capture number="2" name="haskell.keyword.construct.type-family" />
@@ -399,6 +346,7 @@
399346 <template>^(?!\s+\1\S)(?!\s*$)</template>
400347 </ends-with>
401348 <subscopes>
349+ <include syntax="self" collection="comments" />
402350 <include syntax="self" collection="type" optional="true" repeat="true" />
403351 <scope>
404352 <expression>=</expression>
@@ -410,7 +358,7 @@
410358
411359 <collection name="definition">
412360 <scope name="haskell.definition.type.function">
413− <symbol type="function" scope="local">
361+ <symbol type="function">
414362 <context behavior="whitespace" foldable="true" />
415363 </symbol>
416364 <starts-with>
@@ -422,35 +370,15 @@
422370 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
423371 </ends-with>
424372 <subscopes>
373+ <include syntax="self" collection="comments" />
425374 <include syntax="self" collection="type-annotation" />
426375 <include syntax="self" collection="implementation" />
427376 </subscopes>
428377 </scope>
429378 </collection>
430379
431− <collection name="do-bind">
432− <scope name="do-bind">
433− <symbol>
434− <context behavior="whitespace"></context>
435− </symbol>
436− <starts-with>
437− <expression>^(?=((\h*)\S.+&lt;-($|\h)))</expression>
438− </starts-with>
439− <ends-with>
440− <template>^(?!\1)(?!\2\h)(?!\s*$)</template>
441− </ends-with>
442− <subscopes>
443− <include syntax="self" collection="do-pattern" />
444− <include syntax="self" collection="expressions" />
445− <!-- <scope name="bind-arrow">
446− <expression>&lt;-</expression>
447− </scope> -->
448− </subscopes>
449− </scope>
450− </collection>
451−
452380 <collection name="implementation">
453− <scope name="haskell.definition.type.function">
381+ <scope name="haskell.definition.type.function.implementation">
454382 <starts-with>
455383 <expression>^(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h)</expression>
456384 <capture number="2" name="haskell.keyword.construct.default" />
@@ -460,6 +388,7 @@
460388 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
461389 </ends-with>
462390 <subscopes>
391+ <include syntax="self" collection="comments" />
463392 <include syntax="self" collection="pattern-match" optional="true" repeat="true" />
464393 <scope>
465394 <expression>=</expression>
@@ -472,7 +401,7 @@
472401 </collection>
473402
474403 <collection name="type-annotation">
475− <scope name="haskell.definition.type.function">
404+ <scope name="haskell.definition.type.function.type-signature">
476405 <starts-with>
477406 <expression>^(\h*)`?(\w(\w|')*)`?\h*::($|\h)</expression>
478407 <capture number="2" name="haskell.identifier.function" />
@@ -481,6 +410,7 @@
481410 <template>^(?!\s+\1\S)(?!\s*$)</template>
482411 </ends-with>
483412 <subscopes>
413+ <include syntax="self" collection="comments" />
484414 <include syntax="self" collection="type" />
485415 </subscopes>
486416 </scope>
@@ -500,6 +430,7 @@
500430 <template>^(?!\s+\1\S)(?!\s*$)</template>
501431 </ends-with>
502432 <subscopes>
433+ <include syntax="self" collection="comments" />
503434 <include syntax="self" collection="type" />
504435 </subscopes>
505436 </scope>
@@ -519,6 +450,7 @@
519450 <template>^(?!\s+\1\S)(?!\s*$)</template>
520451 </ends-with>
521452 <subscopes>
453+ <include syntax="self" collection="comments" />
522454 <scope name="haskell.keyword.construct.where">
523455 <expression>where</expression>
524456 </scope>
@@ -534,15 +466,16 @@
534466 <collection name="gadt-constructor">
535467 <scope name="haskell.identifier.type.struct.data.constructor">
536468 <symbol type="constructor">
537− <context behavior="whitespace" />
469+ <context behavior="subtree" foldable="true" />
538470 </symbol>
539− <expression>(^|=|\|)\h+([A-Z](\w|')*)</expression>
540− <capture number="2" name="haskell.identifier.data.name" />
541− </scope>
542− <scope name="identifier.type.struct.GADT.constructor">
543− <symbol type="constructor"></symbol>
544− <expression>^\h+([A-Z](\w|')*)</expression>
545− <capture number="1" name="haskell.identifier.data.name" />
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>
546479 </scope>
547480 </collection>
548481
@@ -551,6 +484,7 @@
551484 <expression>deriving(\h+(newtype|stock|anyclass))?</expression>
552485 </scope>
553486 <scope name="haskell.record.construct.deriving.keyword">
487+ <include syntax="self" collection="comments" />
554488 <expression>via</expression>
555489 </scope>
556490 </collection>
@@ -569,6 +503,7 @@
569503 <capture number="1" name="haskell.record.bracket" />
570504 </ends-with>
571505 <subscopes>
506+ <include syntax="self" collection="comments" />
572507 <include syntax="self" collection="record-definition-field-name" />
573508 <include syntax="self" collection="type" />
574509 </subscopes>
@@ -600,6 +535,7 @@
600535 <expression>\)</expression>
601536 </ends-with>
602537 <subscopes>
538+ <include syntax="self" collection="comments" />
603539 <scope name="haskell.construct.type.typle.comma">
604540 <expression>\,</expression>
605541 </scope>
@@ -614,6 +550,7 @@
614550 <expression>\]</expression>
615551 </ends-with>
616552 <subscopes>
553+ <include syntax="self" collection="comments" />
617554 <include syntax="self" collection="type" />
618555 </subscopes>
619556 </scope>
@@ -648,6 +585,7 @@
648585 <template>^(?!\s+\1\S)(?!\s*$)</template>
649586 </ends-with>
650587 <subscopes>
588+ <include syntax="self" collection="comments" />
651589 <scope name="haskell.keyword.construct.where">
652590 <expression>where</expression>
653591 </scope>
@@ -667,6 +605,7 @@
667605 <capture number="1" name="haskell.type-list.bracket" />
668606 </ends-with>
669607 <subscopes>
608+ <include syntax="self" collection="comments" />
670609 <include syntax="self" collection="type" />
671610 </subscopes>
672611 </scope>
@@ -683,6 +622,7 @@
683622 <capture number="1" name="haskell.keyword.construct.lambda" />
684623 </ends-with>
685624 <subscopes>
625+ <include syntax="self" collection="comments" />
686626 <include syntax="self" collection="pattern-match" />
687627 </subscopes>
688628 </scope>
@@ -704,6 +644,7 @@
704644 <template>^(?!\1\s*\S)(?!s*$)</template>
705645 </ends-with>
706646 <subscopes>
647+ <include syntax="self" collection="comments" />
707648 <include syntax="self" collection="definition" />
708649 </subscopes>
709650 </scope>
@@ -743,12 +684,12 @@
743684
744685
745686 <collection name="strings">
746− <scope name="haskell.string.double-quoted">
687+ <scope name="haskell.string.double-quoted" spell-check="true">
747688 <starts-with>
748− <expression>"</expression>
689+ <expression>&quot;</expression>
749690 </starts-with>
750691 <ends-with>
751− <expression>"</expression>
692+ <expression>&quot;</expression>
752693 </ends-with>
753694 <subscopes>
754695 <scope name="haskell.string.escape-sequences">
@@ -785,6 +726,7 @@
785726 </ends-with>
786727 <subscopes>
787728 <scope name="identifier.haskell.type">
729+ <symbol type="expression" />
788730 <symbol type="expression" />
789731 <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
790732 <capture number="1" name="identifier.type" />
@@ -809,6 +751,7 @@
809751 </ends-with>
810752 <subscopes>
811753 <scope name="haskell.construct.qualified">
754+ <symbol type="expression" />
812755 <expression>qualified</expression>
813756 <capture number="0" name="haskell.construct.keyword.qualified" />
814757 </scope>
@@ -826,6 +769,7 @@
826769 </ends-with>
827770 <subscopes anchored="true">
828771 <include syntax="self" collection="import-list" />
772+ <symbol type="expression" />
829773 </subscopes>
830774 </scope>
831775
@@ -859,6 +803,7 @@
859803 </ends-with>
860804 <subscopes>
861805 <scope name="haskell.identifier.struct">
806+ <symbol type="expression" />
862807 <symbol type="reference" scope="local" />
863808 <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
864809 <capture number="1" name="haskell.import-list.identifier.type.name" />
@@ -872,13 +817,6 @@
872817 </scope>
873818 </collection>
874819
875− <!-- <collection name="special">
876− <scope>
877− <expression>(;|,)</expression>
878− </scope>
879− </collection> -->
880−
881−
882820 <collection name="reservedop">
883821 <scope name="keyword.operator">
884822 <expression>(\.\.|:|::|=|\\|\||&lt;-|-&gt;|@|~|=>)</expression>
@@ -886,10 +824,11 @@
886824 </collection>
887825
888826 <collection name="keywords">
889− <scope name="haskell.keyword.modifier">
827+ <scope name="haskell.keyword.self">
890828 <symbol type="keyword" />
891829 <strings>
892830 <string>do</string>
831+ <string>mdo</string>
893832 <string>in</string>
894833 <string>infix</string>
895834 <string>infixl</string>
@@ -927,20 +866,18 @@
927866 <strings>
928867 <string>undefined</string>
929868 <string>_</string>
869+ <string>@</string>
930870 </strings>
931871 </scope>
932872 </collection>
933873
934874 <collection name="comments">
935875 <scope name="haskell.comment.single" spell-check="true">
936− <starts-with>
937− <expression>--</expression>
938− </starts-with>
939− <ends-with>
940− <expression>$</expression>
941− </ends-with>
876+ <symbol type="comment" />
877+ <expression> --.*$</expression>
942878 </scope>
943879 <scope name="haskell.comment.block" spell-check="true">
880+ <symbol type="comment" />
944881 <starts-with>
945882 <expression>{-</expression>
946883 </starts-with>
Haskell Language Server.novaextension/extension.json+200−159
@@ -6,292 +6,333 @@
66 "version": "1.0",
77 "categories": ["languages", "formatters"],
88 "main": "main.js",
9− "entitlements": {
9+ "entitlements":
10+ {
1011 "process": true,
1112 "filesystem": "readwrite",
1213 "requests": true
1314 },
14− "configWorkspace": [{
15+ "configWorkspace": [
16+ {
1517 "key": "haskell-language-server-path",
1618 "title": "Haskell Language Server path",
1719 "description": "If you want to use a custom HLS build for this project, then specify the path to it here.",
1820 "type": "path",
1921 "placeholder": "/usr/local/bin/example"
20− }, {
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+ {
2132 "type": "section",
2233 "title": "Haskell Language Server settings",
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": [{
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",
5360 "type": "section",
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",
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",
6066 "default": true,
61− "description": "Enables explicit imports code actions"
62− }, {
63− "key": "haskell.plugin.importLens.codeLensOn",
64− "title": "Enable code lens",
65− "type": "boolean",
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",
6673 "default": true,
67− "description": "Enables explicit imports code lenses"
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
6882 }]
69− }, {
83+ },
84+ {
7085 "title": "HLint",
7186 "type": "section",
72− "children": [{
87+ "children": [
88+ {
7389 "key": "haskell.plugin.hlint.codeActionsOn",
7490 "title": "Enable code actions",
7591 "type": "boolean",
7692 "default": true,
7793 "description": "Enables hlint code actions (apply hints)"
78− }, {
94+ },
95+ {
7996 "key": "haskell.plugin.hlint.diagnosticsOn",
8097 "title": "Enable diagnostics",
8198 "type": "boolean",
8299 "default": true,
83100 "description": "Enables hlint diagnostics"
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− }]
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"
94128 }]
95− }, {
129+ },
130+
131+ {
96132 "title": "Eval",
97133 "type": "section",
98− "children": [{
134+ "children": [
135+ {
99136 "key": "haskell.plugin.eval.globalOn",
100137 "title": "Enable",
101138 "type": "boolean",
102139 "default": true,
103140 "description": "Enables eval plugin"
104141 }]
105− }, {
142+ },
143+ {
106144 "title": "Module name",
107145 "type": "section",
108− "children": [{
146+ "children": [
147+ {
109148 "key": "haskell.plugin.moduleName.globalOn",
110149 "title": "Enable",
111150 "type": "boolean",
112151 "default": true,
113152 "description": "Enables module name plugin"
114153 }]
115− }, {
154+ },
155+ {
116156 "title": "Splice",
117157 "type": "section",
118− "children": [{
158+ "children": [
159+ {
119160 "key": "haskell.plugin.splice.globalOn",
120161 "title": "Enable",
121162 "type": "boolean",
122163 "default": true,
123164 "description": "Enables splice plugin (expand template haskell definitions)"
124165 }]
125− }, {
166+ },
167+ {
126168 "title": "Haddock comments",
127169 "type": "section",
128− "children": [{
170+ "children": [
171+ {
129172 "key": "haskell.plugin.haddockComments.globalOn",
130173 "title": "Enable",
131174 "type": "boolean",
132175 "default": true,
133176 "description": "Enables haddock comments plugin"
134177 }]
135− }, {
178+ },
179+ {
136180 "title": "Class",
137181 "type": "section",
138− "children": [{
182+ "children": [
183+ {
139184 "key": "haskell.plugin.class.globalOn",
140185 "title": "Enable",
141186 "type": "boolean",
142187 "default": true,
143188 "description": "Enables type class plugin"
144189 }]
145− }, {
190+ },
191+ {
146192 "title": "Retrie",
147193 "type": "section",
148− "children": [{
194+ "children": [
195+ {
149196 "key": "haskell.plugin.retrie.globalOn",
150197 "title": "Enable",
151198 "type": "boolean",
152199 "default": true,
153200 "description": "Enables retrie plugin"
154201 }]
155− }, {
202+ },
203+ {
156204 "title": "Wingman",
157205 "type": "section",
158− "children": [{
206+ "children": [
207+ {
159208 "key": "haskell.plugin.tactics.globalOn",
160209 "title": "Enable",
161210 "type": "boolean",
162211 "default": true,
163212 "description": "Enables Wingman (tactics) plugin"
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− }]
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"
205255 }]
206− }, {
256+ },
257+ {
207258 "title": "Pragmas",
208259 "type": "section",
209− "children": [{
260+ "children": [
261+ {
210262 "key": "haskell.plugin.pragmas.codeActionsOn",
211263 "title": "Enable code actions",
212264 "type": "boolean",
213265 "default": true,
214266 "description": "Enables pragmas code actions"
215− }, {
267+ },
268+ {
216269 "key": "haskell.plugin.pragmas.completionOn",
217270 "title": "Enable completions",
218271 "type": "boolean",
219272 "default": true,
220273 "description": "Enables pragmas completions"
221274 }]
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− }, {
275+ },
276+ {
277+ "title": "Type lenses",
243278 "description": "Not currently implemented in Nova",
244279 "type": "section",
245− "children": [{
280+ "children": [
281+ {
246282 "key": "haskell.plugin.ghcide-type-lenses.globalOn",
247283 "title": "Enable",
248284 "type": "boolean",
249285 "default": true,
250286 "description": "Enables type lenses plugin"
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− }]
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"]
262295 }]
263− }, {
296+ },
297+ {
264298 "title": "Refine imports",
265299 "type": "section",
266− "children": [{
300+ "children": [
301+ {
267302 "key": "haskell.plugin.refineImports.globalOn",
268303 "title": "Enable",
269304 "type": "boolean",
270305 "default": true,
271306 "description": "Enables refine imports plugin"
272307 }]
273− }]
274− }]
308+ }
309+ ]
275310 }],
276311 "activationEvents": ["onLanguage:haskell", "onLanguage:hs"],
277− "commands": {
278− "editor": [{
312+ "commands":
313+ {
314+ "editor": [
315+ {
279316 "title": "Format file with Haskell Language Server",
280317 "command": "format",
281318 "when": "editorSyntax == 'haskell' && editorHasFocus",
282− "filters": {
319+ "filters":
320+ {
283321 "syntaxes": ["haskell"]
284322 }
285323 }],
286− "extensions": [{
324+ "extensions": [
325+ {
287326 "title": "Stop",
288327 "paletteTitle": "Stop Haskell Language Server",
289328 "command": "stop"
290− }, {
329+ },
330+ {
291331 "title": "Restart",
292332 "paletteTitle": "Restart Haskell Language Server",
293333 "command": "restart"
294− }, {
334+ },
335+ {
295336 "title": "Clear cached versions",
296337 "paletteTitle": "Clear cached versions of Haskell Language Server",
297338 "command": "clear-cache"