master..3eb1500 · haskell-nova

git.iko.soy/haskell-nova

on 3eb1500 help sign in

Haskell Language Server.novaextension/Scripts/download.js+24−14

since splitsnapshots

unifiedsplit

@@ -5,8 +5,6 @@ const {

5const {

6 readStream,

7 getStorage,

8− call,

9− hasCustomEnv

10} = require("utils");

8} = require("utils");

12exports.getHLS = getHLS;

10exports.getHLS = getHLS;

@@ -45,9 +43,6 @@ async function downloadTool(name) {

45 const storagePath = getStorageForTool(name);

43 const storagePath = getStorageForTool(name);

46 console.log("Downloading " + storagePath);

44 console.log("Downloading " + storagePath);

47 const urls = await getHLSAssets();

45 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− }

51 const response = await fetch(urls[name]);

46 const response = await fetch(urls[name]);

52 if (!response.ok) {

47 if (!response.ok) {

53 console.error(response.statusText);

48 console.error(response.statusText);

@@ -152,12 +147,8 @@ async function getHLS() {

152 return explicitPath

147 return explicitPath

153 }

148 }

154

149

155− const localHLSPath = await which("haskell-language-server").catch((_) => null)

156− if (hasCustomEnv() && localHLSPath) {

157− return localHLSPath

158− }

159−

160 const version = await getGHCVersion();

150 const version = await getGHCVersion();

151+ const localHLSPath = await which("haskell-language-server").catch((_) => null)

161 if (localHLSPath) {

152 if (localHLSPath) {

162 sendNotification("Found HLS", "Found haskell-language-server in PATH. Checking if it is the right version.")

153 sendNotification("Found HLS", "Found haskell-language-server in PATH. Checking if it is the right version.")

163 const v = await getHLSVersion(localHLSPath)

154 const v = await getHLSVersion(localHLSPath)

@@ -184,16 +175,35 @@ function notifyToolDownloading(name) {

184}

175}

185

176

186function getHLSVersion(path) {

177function getHLSVersion(path) {

187− return call(path, {

178+ return call(new Process(path, {

188 args: ["--version"],

179 args: ["--version"],

189− })

180+ }))

190 .then((x) => x.match(/$GHC: (\S+)$/)[1].trim())

181 .then((x) => x.match(/$GHC: (\S+)$/)[1].trim())

191 .catch((err) => sendPermanentNotification("HLS version check failed", err))

182 .catch((err) => sendPermanentNotification("HLS version check failed", err))

192}

183}

193

184

194function which(name) {

185function which(name) {

195− return call("/usr/bin/which", {

186+ return call(new Process("/usr/bin/which", {

196 args: [name],

187 args: [name],

197 shell: true,

188 shell: true,

198− }).then((p) => p.trim())

189+ })).then((p) => p.trim())

190+}

191+

192+function call(process) {

193+ const promise = new Promise((resolve, reject) => {

194+ process.onDidExit((exitCode) => {

195+ console.log(exitCode)

196+ if (exitCode == 0) {

197+ readStream(process.stdout).then((x) => {

198+ resolve(x);

199+ });

200+ } else {

201+ readStream(process.stderr).then((x) => {

202+ reject(x)

203+ });

204+ }

205+ });

206+ })

207+ process.start()

208+ return promise

199}

209}

Haskell Language Server.novaextension/Scripts/main.js+6−5

@@ -9,9 +9,8 @@ const {

9 getHLSConfig,

10} = require("configuration");

11const {

12− getFileName, createEnv, getEnv

12+ getFileName,

13} = require("utils");

14−

15exports.activate = function () {

14exports.activate = function () {

16 nova.commands.register("stop", (_workspace) => {

15 nova.commands.register("stop", (_workspace) => {

17 stopServer();

16 stopServer();

@@ -108,12 +107,10 @@ function applyAllLSPEdits(edits, text) {

108}

107}

109let lspClient = null;

108let lspClient = null;

110async function startServer() {

109async function startServer() {

111− await createEnv()

112 stopServer();

110 stopServer();

113 const path = await getServerPath();

111 const path = await getServerPath();

114− const env = await getEnv()

115 const serverOptions = {

112 const serverOptions = {

116− path, env,

113+ path: path,

117 args: ["lsp", "--cwd", nova.workspace.path],

114 args: ["lsp", "--cwd", nova.workspace.path],

118 };

115 };

119 const clientOptions = {

116 const clientOptions = {

@@ -140,3 +137,7 @@ function stopServer() {

140function getServerPath() {

137function getServerPath() {

141 return getHLS();

138 return getHLS();

142}

139}

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−

6function readStream(readableStream) {

1function readStream(readableStream) {

7 return new Promise((resolve, _reject) => {

2 return new Promise((resolve, _reject) => {

8 const reader = readableStream.getReader();

3 const reader = readableStream.getReader();

@@ -53,90 +48,4 @@ function traceRaw(x) {

53 return x;

48 return x;

54}

49}

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 };

51+module.exports = { readStream, getStorage, getFileName, trace, traceRaw };

142−

Haskell Language Server.novaextension/Syntaxes/Haskell.xml+10−29

@@ -65,6 +65,7 @@

66 <template-scopes>

67 <include syntax="self" collection="Quote" />

68+ <include syntax="self" collection="comments" />

68 </template-scopes>

69 </template-scopes>

70 <collections>

71 <collections>

@@ -136,7 +137,6 @@

136 <capture number="1" name="haskell.pattern.record.bracket" />

137 <capture number="1" name="haskell.pattern.record.bracket" />

137 </ends-with>

138 </ends-with>

138 <subscopes>

139 <subscopes>

139− <include syntax="self" collection="comments" />

140 <include syntax="self" collection="expressions" />

141 <scope name="record-sep">

142 <expression>=</expression>

@@ -159,7 +159,6 @@

159 <capture number="1" name="haskell.pattern.record.bracket" />

160 </ends-with>

161 <subscopes>

162− <include syntax="self" collection="comments" />

163 <scope name="haskell.pattern.record.wildcard">

162 <scope name="haskell.pattern.record.wildcard">

164 <expression>\.\.</expression>

163 <expression>\.\.</expression>

165 </scope>

164 </scope>

@@ -186,7 +185,6 @@

186 <capture number="1" name="haskell.list.bracket" />

185 <capture number="1" name="haskell.list.bracket" />

187 </ends-with>

186 </ends-with>

188 <subscopes>

187 <subscopes>

189− <include syntax="self" collection="comments" />

190 <include syntax="self" collection="expressions" />

188 <include syntax="self" collection="expressions" />

191 </subscopes>

189 </subscopes>

192 </scope>

190 </scope>

@@ -241,7 +239,6 @@

241 <capture number="1" name="haskell.tuple.bracket" />

239 <capture number="1" name="haskell.tuple.bracket" />

242 </ends-with>

240 </ends-with>

243 <subscopes>

241 <subscopes>

244− <include syntax="self" collection="comments" />

245 <include syntax="self" collection="expressions" />

242 <include syntax="self" collection="expressions" />

246 </subscopes>

243 </subscopes>

247 </scope>

244 </scope>

@@ -266,7 +263,6 @@

266 <expression>(?=(where|^\s*$))</expression>

263 <expression>(?=(where|^\s*$))</expression>

267 </ends-with>

264 </ends-with>

268 <subscopes>

265 <subscopes>

269− <include syntax="self" collection="comments" />

270 <include syntax="self" collection="type" />

266 <include syntax="self" collection="type" />

271 </subscopes>

267 </subscopes>

272 </scope>

268 </scope>

@@ -346,7 +342,6 @@

346 <template>^(?!\s+\1\S)(?!\s*$)</template>

342 <template>^(?!\s+\1\S)(?!\s*$)</template>

347 </ends-with>

343 </ends-with>

348 <subscopes>

344 <subscopes>

349− <include syntax="self" collection="comments" />

350 <include syntax="self" collection="type" optional="true" repeat="true" />

345 <include syntax="self" collection="type" optional="true" repeat="true" />

351 <scope>

346 <scope>

352 <expression>=</expression>

347 <expression>=</expression>

@@ -370,7 +365,6 @@

370 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>

365 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>

371 </ends-with>

366 </ends-with>

372 <subscopes>

367 <subscopes>

373− <include syntax="self" collection="comments" />

374 <include syntax="self" collection="type-annotation" />

368 <include syntax="self" collection="type-annotation" />

375 <include syntax="self" collection="implementation" />

369 <include syntax="self" collection="implementation" />

376 </subscopes>

370 </subscopes>

@@ -388,7 +382,6 @@

388 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>

382 <template>^(?!\1\3\s)(?!\s+\1\S)(?!\s*$)</template>

389 </ends-with>

383 </ends-with>

390 <subscopes>

384 <subscopes>

391− <include syntax="self" collection="comments" />

392 <include syntax="self" collection="pattern-match" optional="true" repeat="true" />

385 <include syntax="self" collection="pattern-match" optional="true" repeat="true" />

393 <scope>

386 <scope>

394 <expression>=</expression>

387 <expression>=</expression>

@@ -410,7 +403,6 @@

410 <template>^(?!\s+\1\S)(?!\s*$)</template>

403 <template>^(?!\s+\1\S)(?!\s*$)</template>

411 </ends-with>

404 </ends-with>

412 <subscopes>

405 <subscopes>

413− <include syntax="self" collection="comments" />

414 <include syntax="self" collection="type" />

406 <include syntax="self" collection="type" />

415 </subscopes>

407 </subscopes>

416 </scope>

408 </scope>

@@ -430,7 +422,6 @@

430 <template>^(?!\s+\1\S)(?!\s*$)</template>

422 <template>^(?!\s+\1\S)(?!\s*$)</template>

431 </ends-with>

423 </ends-with>

432 <subscopes>

424 <subscopes>

433− <include syntax="self" collection="comments" />

434 <include syntax="self" collection="type" />

425 <include syntax="self" collection="type" />

435 </subscopes>

426 </subscopes>

436 </scope>

427 </scope>

@@ -450,7 +441,6 @@

450 <template>^(?!\s+\1\S)(?!\s*$)</template>

441 <template>^(?!\s+\1\S)(?!\s*$)</template>

451 </ends-with>

442 </ends-with>

452 <subscopes>

443 <subscopes>

453− <include syntax="self" collection="comments" />

454 <scope name="haskell.keyword.construct.where">

444 <scope name="haskell.keyword.construct.where">

455 <expression>where</expression>

445 <expression>where</expression>

456 </scope>

446 </scope>

@@ -484,7 +474,6 @@

484 <expression>deriving(\h+(newtype|stock|anyclass))?</expression>

474 <expression>deriving(\h+(newtype|stock|anyclass))?</expression>

485 </scope>

475 </scope>

486 <scope name="haskell.record.construct.deriving.keyword">

476 <scope name="haskell.record.construct.deriving.keyword">

487− <include syntax="self" collection="comments" />

488 <expression>via</expression>

477 <expression>via</expression>

489 </scope>

478 </scope>

490 </collection>

479 </collection>

@@ -503,7 +492,6 @@

503 <capture number="1" name="haskell.record.bracket" />

492 <capture number="1" name="haskell.record.bracket" />

504 </ends-with>

493 </ends-with>

505 <subscopes>

494 <subscopes>

506− <include syntax="self" collection="comments" />

507 <include syntax="self" collection="record-definition-field-name" />

495 <include syntax="self" collection="record-definition-field-name" />

508 <include syntax="self" collection="type" />

496 <include syntax="self" collection="type" />

509 </subscopes>

497 </subscopes>

@@ -535,7 +523,6 @@

535 <expression>\)</expression>

523 <expression>\)</expression>

536 </ends-with>

524 </ends-with>

537 <subscopes>

525 <subscopes>

538− <include syntax="self" collection="comments" />

539 <scope name="haskell.construct.type.typle.comma">

526 <scope name="haskell.construct.type.typle.comma">

540 <expression>\,</expression>

527 <expression>\,</expression>

541 </scope>

528 </scope>

@@ -550,7 +537,6 @@

550 <expression>\]</expression>

537 <expression>\]</expression>

551 </ends-with>

538 </ends-with>

552 <subscopes>

539 <subscopes>

553− <include syntax="self" collection="comments" />

554 <include syntax="self" collection="type" />

540 <include syntax="self" collection="type" />

555 </subscopes>

541 </subscopes>

556 </scope>

542 </scope>

@@ -585,7 +571,6 @@

585 <template>^(?!\s+\1\S)(?!\s*$)</template>

571 <template>^(?!\s+\1\S)(?!\s*$)</template>

586 </ends-with>

572 </ends-with>

587 <subscopes>

573 <subscopes>

588− <include syntax="self" collection="comments" />

589 <scope name="haskell.keyword.construct.where">

574 <scope name="haskell.keyword.construct.where">

590 <expression>where</expression>

575 <expression>where</expression>

591 </scope>

576 </scope>

@@ -605,7 +590,6 @@

605 <capture number="1" name="haskell.type-list.bracket" />

590 <capture number="1" name="haskell.type-list.bracket" />

606 </ends-with>

591 </ends-with>

607 <subscopes>

592 <subscopes>

608− <include syntax="self" collection="comments" />

609 <include syntax="self" collection="type" />

593 <include syntax="self" collection="type" />

610 </subscopes>

594 </subscopes>

611 </scope>

595 </scope>

@@ -622,7 +606,6 @@

622 <capture number="1" name="haskell.keyword.construct.lambda" />

606 <capture number="1" name="haskell.keyword.construct.lambda" />

623 </ends-with>

607 </ends-with>

624 <subscopes>

608 <subscopes>

625− <include syntax="self" collection="comments" />

626 <include syntax="self" collection="pattern-match" />

609 <include syntax="self" collection="pattern-match" />

627 </subscopes>

610 </subscopes>

628 </scope>

611 </scope>

@@ -644,7 +627,6 @@

644 <template>^(?!\1\s*\S)(?!s*$)</template>

627 <template>^(?!\1\s*\S)(?!s*$)</template>

645 </ends-with>

628 </ends-with>

646 <subscopes>

629 <subscopes>

647− <include syntax="self" collection="comments" />

648 <include syntax="self" collection="definition" />

630 <include syntax="self" collection="definition" />

649 </subscopes>

631 </subscopes>

650 </scope>

632 </scope>

@@ -684,12 +666,12 @@

684

666

685

667

686 <collection name="strings">

668 <collection name="strings">

687− <scope name="haskell.string.double-quoted" spell-check="true">

669+ <scope name="haskell.string.double-quoted">

688 <starts-with>

670 <starts-with>

689− <expression>"</expression>

671+ <expression>"</expression>

690 </starts-with>

672 </starts-with>

691 <ends-with>

673 <ends-with>

692− <expression>"</expression>

674+ <expression>"</expression>

693 </ends-with>

675 </ends-with>

694 <subscopes>

676 <subscopes>

695 <scope name="haskell.string.escape-sequences">

677 <scope name="haskell.string.escape-sequences">

@@ -726,7 +708,6 @@

726 </ends-with>

708 </ends-with>

727 <subscopes>

709 <subscopes>

728 <scope name="identifier.haskell.type">

710 <scope name="identifier.haskell.type">

729− <symbol type="expression" />

730 <symbol type="expression" />

711 <symbol type="expression" />

731 <expression>([A-Z](\w|')*)\h*($\h*\.\.\h*$)?</expression>

712 <expression>([A-Z](\w|')*)\h*($\h*\.\.\h*$)?</expression>

732 <capture number="1" name="identifier.type" />

713 <capture number="1" name="identifier.type" />

@@ -751,7 +732,6 @@

751 </ends-with>

732 </ends-with>

752 <subscopes>

733 <subscopes>

753 <scope name="haskell.construct.qualified">

734 <scope name="haskell.construct.qualified">

754− <symbol type="expression" />

755 <expression>qualified</expression>

735 <expression>qualified</expression>

756 <capture number="0" name="haskell.construct.keyword.qualified" />

736 <capture number="0" name="haskell.construct.keyword.qualified" />

757 </scope>

737 </scope>

@@ -769,7 +749,6 @@

769 </ends-with>

749 </ends-with>

770 <subscopes anchored="true">

750 <subscopes anchored="true">

771 <include syntax="self" collection="import-list" />

751 <include syntax="self" collection="import-list" />

772− <symbol type="expression" />

773 </subscopes>

752 </subscopes>

774 </scope>

753 </scope>

775

754

@@ -803,7 +782,6 @@

803 </ends-with>

782 </ends-with>

804 <subscopes>

783 <subscopes>

805 <scope name="haskell.identifier.struct">

784 <scope name="haskell.identifier.struct">

806− <symbol type="expression" />

807 <symbol type="reference" scope="local" />

785 <symbol type="reference" scope="local" />

808 <expression>([A-Z](\w|')*)\h*($\h*\.\.\h*$)?</expression>

786 <expression>([A-Z](\w|')*)\h*($\h*\.\.\h*$)?</expression>

809 <capture number="1" name="haskell.import-list.identifier.type.name" />

787 <capture number="1" name="haskell.import-list.identifier.type.name" />

@@ -873,11 +851,14 @@

873

851

874 <collection name="comments">

852 <collection name="comments">

875 <scope name="haskell.comment.single" spell-check="true">

853 <scope name="haskell.comment.single" spell-check="true">

876− <symbol type="comment" />

854+ <starts-with>

855+ <expression>--</expression>

856+ </starts-with>

857+ <ends-with>

877− <expression> --.*$</expression>

858+ <expression>$</expression>

859+ </ends-with>

878 </scope>

860 </scope>

879 <scope name="haskell.comment.block" spell-check="true">

861 <scope name="haskell.comment.block" spell-check="true">

880− <symbol type="comment" />

881 <starts-with>

862 <starts-with>

882 <expression>{-</expression>

863 <expression>{-</expression>

883 </starts-with>

864 </starts-with>

Haskell Language Server.novaextension/extension.json−8

@@ -20,14 +20,6 @@

20 "type": "path",

21 "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 {

23 {

32 "type": "section",

24 "type": "section",

33 "title": "Haskell Language Server settings",

25 "title": "Haskell Language Server settings",