git.iko.soy/haskell-nova
on e9d579a help sign in
7882415
swap
0 ahead, 18 behind
5 files changed+377−620
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+210−281 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+210−281
@@ -41,7 +41,7 @@
4141 <indentation>
4242 <increase>
4343 <expression>
44− (case|class|do|let|where|=).*
44+ (case|class|do|let|where).*
4545 </expression>
4646 </increase>
4747 <decrease>
@@ -57,6 +57,8 @@
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" /> -->
61+ <include syntax="self" collection="data-definition" />
6062 <include syntax="self" collection="GADT-definition" />
6163 <include syntax="self" collection="instance" />
6264 <include syntax="self" collection="typeclass" />
@@ -65,6 +67,7 @@
6567
6668 <template-scopes>
6769 <include syntax="self" collection="Quote" />
70+ <include syntax="self" collection="comments" />
6871 </template-scopes>
6972
7073 <collections>
@@ -77,27 +80,53 @@
7780 </collection>
7881
7982 <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" />
83+ <include syntax="self" collection="do-bind" />
9084 <include syntax="self" collection="literal" />
9185 <include syntax="self" collection="operators" />
92− <include syntax="self" collection="record-match" />
9386 <include syntax="self" collection="list" />
94− <include syntax="self" collection="view-pattern" />
9587 <include syntax="self" collection="lambda-case" />
9688 <include syntax="self" collection="lambda-head" />
89+ <include syntax="self" collection="type-applications" />
9790 <include syntax="self" collection="case-expression" />
98− <include syntax="self" collection="qconid" />
9991 <include syntax="self" collection="qvarid" />
92+ <include syntax="self" collection="bind-arrow" />
10093 <include syntax="self" collection="tuple" />
94+
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="view-pattern" />
104+ <include syntax="self" collection="tuple-match" />
105+<!-- <include syntax="self" collection="at-pattern" /> -->
106+ <include syntax="self" collection="varid" />
107+ <include syntax="self" collection="qconid" />
108+ <include syntax="self" collection="record-match" />
109+ <include syntax="self" collection="list-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>
@@ -223,7 +285,7 @@
223285 <expression>(of)</expression>
224286 <capture number="1" name="haskell.case.keyword.condition" />
225287 </ends-with>
226− <subscopes anchored="true">
288+ <subscopes>
227289 <include syntax="self" collection="expressions" />
228290 </subscopes>
229291 </scope>
@@ -241,117 +303,70 @@
241303 <capture number="1" name="haskell.tuple.bracket" />
242304 </ends-with>
243305 <subscopes>
244− <include syntax="self" collection="comments" />
245306 <include syntax="self" collection="expressions" />
246307 </subscopes>
247308 </scope>
248309 </collection>
249310
250311 <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>
312+ <symbol type="interface" />
313+ <scope name="haskell.definition.class">
255314 <starts-with>
256315 <expression>^(\h*)(class)($|\h)</expression>
257316 <capture number="2" name="haskell.keyword.construct.class" />
258317 </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">
318+ <ends-with>
319+ <template>^(?!\s+\1\S)(?!\s*$)</template>
320+ </ends-with>
321+ <subscopes>
322+ <scope name="haskell.keyword.construct.where">
274323 <expression>where</expression>
275324 </scope>
325+ <include syntax="self" collection="type" />
326+ <include syntax="self" collection="type-definition" />
327+ <!-- <include syntax="self" collection="type-annotation" /> -->
328+ <include syntax="self" collection="definition" />
276329 </subscopes>
277330 </scope>
278331 </collection>
279332
280333 <collection name="instance">
281334 <scope name="haskell.instance">
282− <symbol type="category" name-selector="haskell.keyword.construct.instance.name">
283− <context behavior="whitespace" foldable="true" />
284− </symbol>
335+ <symbol type="category" />
285336 <starts-with>
286337 <expression>^(\h*)(instance)($|\h)</expression>
287338 <capture number="2" name="haskell.keyword.construct.instance" />
288339 </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">
303− <expression>where</expression>
304− </scope>
305− </subscopes>
306− </scope>
307− </collection>
308−
309− <collection name="type-family-definition">
310− <scope name="haskell.definition.type-family.type">
311− <starts-with>
312− <expression>^(\h*)(type\h+family)</expression>
313− <capture number="2" name="haskell.keyword.construct.type-family" />
314− </starts-with>
315340 <ends-with>
316341 <template>^(?!\s+\1\S)(?!\s*$)</template>
317342 </ends-with>
318− <subscopes anchored="true" skip-whitespace="false">
319− <scope name="haskell.type-family.head">
320− <starts-with>
321− <expression></expression>
322− </starts-with>
323− <ends-with>
324− <expression>where</expression>
325− <capture number="0" name="haskell.keyword.construct.where" />
326− </ends-with>
327− <subscopes anchored="true">
328− <scope name="haskell.identifier.type-family.type.name">
329− <expression>\S+</expression>
330− </scope>
331− <include syntax="self" collection="type" repeat="true" optional="true" />
332− </subscopes>
343+ <subscopes>
344+ <scope name="haskell.keyword.construct.where">
345+ <expression>where</expression>
333346 </scope>
334−
335− <include syntax="self" collection="type-family-case-definition" optional="true" repeat="true" />
347+ <include syntax="self" collection="type" />
348+ <include syntax="self" collection="type-definition" />
349+ <include syntax="self" collection="type-annotation" />
350+ <include syntax="self" collection="definition" />
336351 </subscopes>
337352 </scope>
338353 </collection>
339354
340− <collection name="type-family-case-definition">
341− <scope name="haskell.definition.type-family.type.case">
355+ <collection name="type-family-definition">
356+ <scope name="haskell.definition.type.type-family">
357+ <symbol type="type" />
342358 <starts-with>
343− <expression>^(\h*)(?=\S)</expression>
359+ <expression>^(\h*)(type\h+family)\h+`?(\w(\w|')*)`?($|\h)</expression>
360+ <capture number="2" name="haskell.keyword.construct.type-family" />
344361 </starts-with>
345362 <ends-with>
346363 <template>^(?!\s+\1\S)(?!\s*$)</template>
347364 </ends-with>
348365 <subscopes>
349− <include syntax="self" collection="comments" />
350− <include syntax="self" collection="type" optional="true" repeat="true" />
351− <scope>
352− <expression>=</expression>
366+ <scope name="haskell.keyword.construct.where">
367+ <expression>where</expression>
353368 </scope>
354− <include syntax="self" collection="type" optional="true" repeat="true" />
369+ <include syntax="self" collection="type" />
355370 </subscopes>
356371 </scope>
357372 </collection>
@@ -359,26 +374,47 @@
359374 <collection name="definition">
360375 <scope name="haskell.definition.type.function">
361376 <symbol type="function">
362− <context behavior="whitespace" foldable="true" />
377+ <display-name>
378+ <component selector="haskell.definition.type.function" />
379+ </display-name>
380+
363381 </symbol>
364382 <starts-with>
365383 <expression>^(?=(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h))</expression>
366384 <capture number="2" name="haskell.keyword.construct.default" />
367− <capture number="3" name="haskell.identifier.function.name" />
385+ <capture number="3" name="haskell.identifier.function" />
368386 </starts-with>
369387 <ends-with>
370388 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
371389 </ends-with>
372390 <subscopes>
373− <include syntax="self" collection="comments" />
374391 <include syntax="self" collection="type-annotation" />
375392 <include syntax="self" collection="implementation" />
376393 </subscopes>
377394 </scope>
378395 </collection>
379396
397+ <collection name="do-bind">
398+ <scope name="do-bind">
399+ <starts-with>
400+ <expression>^(?=(\h*).+&lt;-($|\h))</expression>
401+ </starts-with>
402+ <ends-with>
403+ <template>^(?!\0)(?!\s+\1\S)(?!\s*$)</template>
404+ </ends-with>
405+ <subscopes anchored="true">
406+ <include syntax="self" collection="pattern-match" />
407+ <scope name="bind-arrow">
408+ <expression>&lt;-</expression>
409+ </scope>
410+ <include syntax="self" collection="expressions" repeat="true" />
411+ </subscopes>
412+ </scope>
413+ </collection>
414+
380415 <collection name="implementation">
381− <scope name="haskell.definition.type.function.implementation">
416+ <scope name="haskell.definition.type.function">
417+ <local scope="within-construct" />
382418 <starts-with>
383419 <expression>^(\h*)(default\h+)?`?(\w(\w|')*)`?($|\h)</expression>
384420 <capture number="2" name="haskell.keyword.construct.default" />
@@ -388,20 +424,14 @@
388424 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>
389425 </ends-with>
390426 <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" />
427+ <include syntax="self" collection="where-clause" />
428+ <include syntax="self" collection="expressions" />
399429 </subscopes>
400430 </scope>
401431 </collection>
402432
403433 <collection name="type-annotation">
404− <scope name="haskell.definition.type.function.type-signature">
434+ <scope name="haskell.definition.type.function">
405435 <starts-with>
406436 <expression>^(\h*)`?(\w(\w|')*)`?\h*::($|\h)</expression>
407437 <capture number="2" name="haskell.identifier.function" />
@@ -410,7 +440,6 @@
410440 <template>^(?!\s+\1\S)(?!\s*$)</template>
411441 </ends-with>
412442 <subscopes>
413− <include syntax="self" collection="comments" />
414443 <include syntax="self" collection="type" />
415444 </subscopes>
416445 </scope>
@@ -418,19 +447,15 @@
418447
419448 <collection name="type-definition">
420449 <scope name="haskell.definition.type">
421− <symbol type="type" scope="global">
422− <context behavior="whitespace" foldable="true" />
423− </symbol>
424450 <starts-with>
425451 <expression>^(\h*)(type)\h+(\w(\w|')*)</expression>
426452 <capture number="2" name="haskell.keyword.construct.type" />
427− <capture number="3" name="haskell.identifier.type.name" />
453+ <capture number="3" name="haskell.identifier.type" />
428454 </starts-with>
429455 <ends-with>
430456 <template>^(?!\s+\1\S)(?!\s*$)</template>
431457 </ends-with>
432458 <subscopes>
433− <include syntax="self" collection="comments" />
434459 <include syntax="self" collection="type" />
435460 </subscopes>
436461 </scope>
@@ -438,72 +463,66 @@
438463
439464 <collection name="GADT-definition">
440465 <scope name="haskell.definition.struct.GADT">
441− <symbol type="struct" scope="global">
442− <context behavior="subtree" foldable="false" />
443− </symbol>
444466 <starts-with>
445− <expression>^(\h*)(data|newtype)\h+(\w(\w|')*)</expression>
467+ <expression>^(\h*)(data)\h+(\w(\w|')*)</expression>
446468 <capture number="2" name="haskell.keyword.construct.data.GADT" />
447− <capture number="3" name="haskell.identifier.data.type.name" />
448469 </starts-with>
449470 <ends-with>
450471 <template>^(?!\s+\1\S)(?!\s*$)</template>
451472 </ends-with>
452473 <subscopes>
453− <include syntax="self" collection="comments" />
454− <scope name="haskell.keyword.construct.where">
455− <expression>where</expression>
456− </scope>
457−
458− <include syntax="self" collection="deriving-clause" />
459− <include syntax="self" collection="record-definition" />
460474 <include syntax="self" collection="gadt-constructor" />
461475 <include syntax="self" collection="type" />
476+ <include syntax="self" collection="record-definition" />
477+ <include syntax="self" collection="record-definition-field-name" />
462478 </subscopes>
463479 </scope>
464480 </collection>
465481
466482 <collection name="gadt-constructor">
467− <scope name="haskell.identifier.type.struct.data.constructor">
468− <symbol type="constructor">
469− <context behavior="subtree" foldable="true" />
470− </symbol>
483+ <scope name="identifier.type.struct.GADT.constructor">
484+ <expression>^\h+[A-Z](\w|')*</expression>
485+ </scope>
486+ </collection>
487+
488+ <collection name="data-definition">
489+ <scope name="haskell.definition.struct.data">
471490 <starts-with>
472− <expression>(^|=|\||^)\h+([A-Z](\w|')*)</expression>
473− <capture number="2" name="haskell.identifier.data.name" />
491+ <expression>^(\h*)(data|newtype)\h+(\w(\w|')*)</expression>
492+ <capture number="2" name="haskell.keyword.construct.data.newtype" />
493+ <capture number="3" name="haskell.identifier.type" />
474494 </starts-with>
475− <ends-with />
476− <subscopes anchored="true">
495+ <ends-with>
496+ <template>^(?!\s+\1\S)(?!\s*$)</template>
497+ </ends-with>
498+ <subscopes>
477499 <include syntax="self" collection="record-definition" />
500+ <include syntax="self" collection="data-constructor" />
501+ <include syntax="self" collection="type" />
478502 </subscopes>
479503 </scope>
480504 </collection>
481505
482− <collection name="deriving-clause">
483− <scope name="haskell.record.construct.deriving.keyword">
484− <expression>deriving(\h+(newtype|stock|anyclass))?</expression>
506+ <collection name="data-constructor">
507+ <scope name="haskell.identifier.type.struct.data.constructor">
508+ <expression>=\h+[A-Z](\w|')*</expression>
485509 </scope>
486− <scope name="haskell.record.construct.deriving.keyword">
487− <include syntax="self" collection="comments" />
488− <expression>via</expression>
510+ <scope name="haskell.identifier.type.struct.data.constructor">
511+ <expression>\|\h+[A-Z](\w|')*</expression>
489512 </scope>
490513 </collection>
491514
492515 <collection name="record-definition">
493516 <scope name="haskell.record">
494− <symbol>
495− <context behavior="subtree" foldable="true" />
496− </symbol>
497517 <starts-with>
498− <expression>(?=\{)</expression>
499− <capture number="0" name="haskell.record.bracket" />
518+ <expression>(\{)</expression>
519+ <capture number="1" name="haskell.record.bracket" />
500520 </starts-with>
501521 <ends-with>
502522 <expression>(\})</expression>
503523 <capture number="1" name="haskell.record.bracket" />
504524 </ends-with>
505525 <subscopes>
506− <include syntax="self" collection="comments" />
507526 <include syntax="self" collection="record-definition-field-name" />
508527 <include syntax="self" collection="type" />
509528 </subscopes>
@@ -512,65 +531,26 @@
512531
513532 <collection name="record-definition-field-name">
514533 <scope name="haskell.record.definition.property">
515− <symbol type="property" />
516− <expression>(((?![A-Z])\w(\w|')*)\h*::|(^|\{|,)\h*((?![A-Z])\w(\w|')*))</expression>
517− <capture number="5" name="haskell.record.definition.property.field.property.name" />
518− <capture number="2" name="haskell.record.definition.property.field.property.name" />
534+ <expression>\w(\w|')*\h*::</expression>
519535 </scope>
520536 </collection>
521537
522538 <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" />
530− <scope name="haskell.type.construct.tuple">
531− <starts-with>
532− <expression>\(</expression>
533− </starts-with>
534− <ends-with>
535− <expression>\)</expression>
536− </ends-with>
537− <subscopes>
538− <include syntax="self" collection="comments" />
539− <scope name="haskell.construct.type.typle.comma">
540− <expression>\,</expression>
541− </scope>
542− <include syntax="self" collection="type" />
543− </subscopes>
544− </scope>
545− <scope name="haskell.type.list">
546− <starts-with>
547− <expression>'?\[</expression>
548− </starts-with>
549− <ends-with>
550− <expression>\]</expression>
551− </ends-with>
552− <subscopes>
553− <include syntax="self" collection="comments" />
554− <include syntax="self" collection="type" />
555− </subscopes>
556− </scope>
557− <scope name="haskell.type.star">
558− <expression>\*</expression>
559− </scope>
560− <scope name="haskell.keyword.construct.type-annotation-operator">
561− <expression>::</expression>
562− </scope>
563539 <include syntax="self" collection="type-list" />
564− <scope>
565− <expression>(([A-Z](\w|')*\.)*)'*\!?([A-Z](\w|')*)</expression>
566− <capture number="1" name="haskell.identifier.package.module" />
567− <capture number="4" name="haskell.identifier.type" />
540+ <scope name="haskell.identifier.type">
541+ <expression>([A-Z](\w|')*\.)*[A-Z](\w|')*</expression>
568542 </scope>
569543 <scope name="haskell.keyword.construct.forall">
570544 <expression>forall</expression>
571545 </scope>
572546 <scope name="haskell.identifier.type.variable">
573− <expression>(?!where)(?!=)((?!(\(|\)|\,|\!))\S)((?!(\(|\)|\,))\w)*</expression>
547+ <expression>\w(\w|')*</expression>
548+ </scope>
549+ <scope name="haskell.keyword.construct.function-arrow">
550+ <expression>-&gt;</expression>
551+ </scope>
552+ <scope name="haskell.keyword.construct.fat-arrow">
553+ <expression>=&gt;</expression>
574554 </scope>
575555 </collection>
576556
@@ -585,7 +565,6 @@
585565 <template>^(?!\s+\1\S)(?!\s*$)</template>
586566 </ends-with>
587567 <subscopes>
588− <include syntax="self" collection="comments" />
589568 <scope name="haskell.keyword.construct.where">
590569 <expression>where</expression>
591570 </scope>
@@ -605,7 +584,6 @@
605584 <capture number="1" name="haskell.type-list.bracket" />
606585 </ends-with>
607586 <subscopes>
608− <include syntax="self" collection="comments" />
609587 <include syntax="self" collection="type" />
610588 </subscopes>
611589 </scope>
@@ -622,7 +600,6 @@
622600 <capture number="1" name="haskell.keyword.construct.lambda" />
623601 </ends-with>
624602 <subscopes>
625− <include syntax="self" collection="comments" />
626603 <include syntax="self" collection="pattern-match" />
627604 </subscopes>
628605 </scope>
@@ -636,6 +613,7 @@
636613
637614 <collection name="where-clause">
638615 <scope name="haskell.construct.where">
616+ <local scope="within-parent" />
639617 <starts-with>
640618 <expression>^(\h*)(where)</expression>
641619 <capture number="2" name="haskell.construct.keyword.where" />
@@ -644,7 +622,6 @@
644622 <template>^(?!\1\s*\S)(?!s*$)</template>
645623 </ends-with>
646624 <subscopes>
647− <include syntax="self" collection="comments" />
648625 <include syntax="self" collection="definition" />
649626 </subscopes>
650627 </scope>
@@ -653,9 +630,7 @@
653630
654631 <collection name="qvarid">
655632 <scope name="haskell.identifier.function">
656− <expression>(([A-Z](\w|')*\.)*)(\w(\w|')*)</expression>
657− <capture number="1" name="haskell.identifier.package.module" />
658− <capture number="4" name="haskell.identifier.type" />
633+ <expression>([A-Z](\w|')*\.)*\w(\w|')*</expression>
659634 </scope>
660635 </collection>
661636
@@ -684,12 +659,12 @@
684659
685660
686661 <collection name="strings">
687− <scope name="haskell.string.double-quoted" spell-check="true">
662+ <scope name="haskell.string.double-quoted">
688663 <starts-with>
689− <expression>&quot;</expression>
664+ <expression>"</expression>
690665 </starts-with>
691666 <ends-with>
692− <expression>&quot;</expression>
667+ <expression>"</expression>
693668 </ends-with>
694669 <subscopes>
695670 <scope name="haskell.string.escape-sequences">
@@ -712,11 +687,8 @@
712687
713688 <collection name="module">
714689 <scope name="haskell.definition.module.package">
715− <symbol type="package">
716− <context behavior="subtree" foldable="true" export-local="true" />
717− </symbol>
718690 <starts-with>
719− <expression>^(module)\s+((\w|\.)+)</expression>
691+ <expression>^(module)\s+(\w|\.)+</expression>
720692 <capture number="1" name="haskell.construct.keyword.module" />
721693 <capture number="2" name="haskell.definition.module.package" />
722694 </starts-with>
@@ -724,75 +696,32 @@
724696 <expression>(where)</expression>
725697 <capture number="1" name="haskell.construct.keyword.module" />
726698 </ends-with>
727− <subscopes>
728− <scope name="identifier.haskell.type">
729− <symbol type="expression" />
730− <symbol type="expression" />
731− <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
732− <capture number="1" name="identifier.type" />
733− </scope>
734− <scope name="identifier.variable">
735− <symbol type="expression" />
699+ <subscopes export-symbols="true">
700+ <scope name="identifier.constant">
736701 <expression>(\w|')+</expression>
737− <capture number="0" name="identifier.haskell.function" />
738702 </scope>
739703 </subscopes>
740704 </scope>
741705 </collection>
742706
743707 <collection name="import">
744− <scope name="haskell.construct.import">
745− <starts-with>
746− <expression>^(import)\s</expression>
747− <capture number="1" name="haskell.construct.keyword.import" />
748− </starts-with>
749− <ends-with>
750− <expression>(?=^\S)</expression>
751− </ends-with>
752− <subscopes>
753− <scope name="haskell.construct.qualified">
754− <symbol type="expression" />
755− <expression>qualified</expression>
756− <capture number="0" name="haskell.construct.keyword.qualified" />
757− </scope>
758−
759− <scope name="haskell.construct.hiding">
760− <symbol type="keyword">
761− <context behavior="subtree" />
762− </symbol>
763− <starts-with>
764− <expression>(hiding)\h*(?=\()</expression>
765− <capture number="1" name="haskell.construct.keyword.hiding" />
766− </starts-with>
767− <ends-with>
768− <expression>(?=\))</expression>
769− </ends-with>
770− <subscopes anchored="true">
771− <include syntax="self" collection="import-list" />
772− <symbol type="expression" />
773− </subscopes>
774− </scope>
775−
776− <scope name="haskell.construct.keyword.as">
777− <symbol type="package" />
778− <expression>as(\h+([A-Z]\w*))?</expression>
779− <capture number="2" name="haskell.package.qualified.name" />
780− </scope>
781− <scope name="haskell.identifier.module.package">
782− <symbol type="package" />
783− <expression>([A-Z](\w|')*\.)*[A-Z](\w|')*</expression>
784− <capture number="0" name="haskell.package.name" />
785− </scope>
786− <include syntax="self" collection="import-list" />
787− </subscopes>
708+ <scope name="haskell.construct.keyword.import">
709+ <expression>^import\s</expression>
710+ </scope>
711+ <scope name="haskell.construct.keyword.qualified">
712+ <expression>qualified</expression>
713+ </scope>
714+ <scope name="haskell.construct.keyword.as">
715+ <expression>as</expression>
716+ </scope>
717+ <scope name="haskell.identifier.module.package">
718+ <expression>([A-Z](\w|')*\.)*[A-Z](\w|')*</expression>
788719 </scope>
720+ <include syntax="self" collection="import-list" />
789721 </collection>
790722
791723 <collection name="import-list">
792724 <scope name="import-list">
793− <symbol>
794− <context behavior="subtree" export-local="true" />
795− </symbol>
796725 <starts-with>
797726 <expression>(\()</expression>
798727 <capture number="1" name="haskell.import-list.bracket" />
@@ -802,21 +731,20 @@
802731 <capture number="1" name="haskell.import-list.bracket" />
803732 </ends-with>
804733 <subscopes>
805− <scope name="haskell.identifier.struct">
806− <symbol type="expression" />
807− <symbol type="reference" scope="local" />
808− <expression>([A-Z](\w|')*)\h*(\(\h*\.\.\h*\))?</expression>
809− <capture number="1" name="haskell.import-list.identifier.type.name" />
810− </scope>
811− <scope name="haskell.identifier.function">
812− <symbol type="reference" scope="local" />
813− <expression>(\w|')+</expression>
814− <capture number="0" name="haskell.import-list.function.name" />
734+ <scope name="identifier.decorator">
735+ <expression>([A-Z](\w|')*\.)*\w(\w|')*</expression>
815736 </scope>
816737 </subscopes>
817738 </scope>
818739 </collection>
819740
741+ <!-- <collection name="special">
742+ <scope>
743+ <expression>(;|,)</expression>
744+ </scope>
745+ </collection> -->
746+
747+
820748 <collection name="reservedop">
821749 <scope name="keyword.operator">
822750 <expression>(\.\.|:|::|=|\\|\||&lt;-|-&gt;|@|~|=>)</expression>
@@ -824,11 +752,10 @@
824752 </collection>
825753
826754 <collection name="keywords">
827− <scope name="haskell.keyword.self">
755+ <scope name="haskell.keyword.modifier">
828756 <symbol type="keyword" />
829757 <strings>
830758 <string>do</string>
831− <string>mdo</string>
832759 <string>in</string>
833760 <string>infix</string>
834761 <string>infixl</string>
@@ -866,18 +793,20 @@
866793 <strings>
867794 <string>undefined</string>
868795 <string>_</string>
869− <string>@</string>
870796 </strings>
871797 </scope>
872798 </collection>
873799
874800 <collection name="comments">
875801 <scope name="haskell.comment.single" spell-check="true">
876− <symbol type="comment" />
877− <expression> --.*$</expression>
802+ <starts-with>
803+ <expression>--</expression>
804+ </starts-with>
805+ <ends-with>
806+ <expression>$</expression>
807+ </ends-with>
878808 </scope>
879809 <scope name="haskell.comment.block" spell-check="true">
880− <symbol type="comment" />
881810 <starts-with>
882811 <expression>{-</expression>
883812 </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"