fixup problem with repl closing connection too soon.

An RPC connectio will close if its reader becomes closed, so we can't
pass in a finite Readable as the default

Author: cowboyd

deno.lock

@@ -2,18 +2,10 @@ import type { RPCEndpoint } from "./types.ts";
 import { readline } from "./readline.ts";
 import process from "node:process";
 import completions from "./completions.json" with { type: "json" };
-import { each, spawn } from "effection";
+import { each } from "effection";
 import { useCancellationToken } from "./cancellation-token.ts";
 
-export function* repl(server: RPCEndpoint) {
-  yield* spawn(function* () {
-    for (let notification of yield* each(server.notifications)) {
-      let [method, params] = notification;
-      console.log(`Notification: ${method} ${JSON.stringify(params, null, 2)}`);
-      yield* each.next();
-    }
-  });
-
+export function* repl(server: RPCEndpoint, commands: string[]) {
   let lines = readline({
     prompt: "LSP> ",
     input: process.stdin,
@@ -25,6 +17,12 @@ export function* repl(server: RPCEndpoint) {
     },
   });
 
+  if (commands.length) {
+    console.log(`x
+|
+${commands.map((c) => `+-> ${c}`).join("\n")}`);
+  }
+
   for (let line of yield* each(lines)) {
     let pattern = /([\w\/]+)\((.*)\)/;
     let match = pattern.exec(line);
@@ -38,7 +36,9 @@ export function* repl(server: RPCEndpoint) {
 
         let token = yield* useCancellationToken();
 
-        let response = yield* server.request([method, args, token]);
+        let arg = args.length === 1 ? args[0] : args;
+
+        let response = yield* server.request([method, arg, token]);
 
         console.log(JSON.stringify(response, null, 2));
       } catch (e) {

lib/repl.ts

@@ -22,7 +22,7 @@ export function start(opts: LSPXOptions): Operation<RPCEndpoint> {
         args,
         stdin: "piped",
         stdout: "piped",
-        stderr: "inherit",
+        stderr: "piped",
       });
       let server = yield* useConnection({
         read: process.stdout,
@@ -34,7 +34,7 @@ export function start(opts: LSPXOptions): Operation<RPCEndpoint> {
     let multiplexer = yield* useMultiplexer({ servers });
 
     let client = yield* useConnection({
-      read: opts.input ?? ReadableStream.from([]),
+      read: opts.input ?? new ReadableStream(),
       write: opts.output ?? new WritableStream(),
     });
 

lib/server.ts

@@ -21,11 +21,13 @@ await main(function* (argv) {
       },
     }).parse(argv);
 
-  let lspx = yield* start({ ...opts, commands: opts.lsp });
-
   if (opts.interactive) {
-    yield* repl(lspx);
+    let lspx = yield* start({ ...opts, commands: opts.lsp });
+    yield* repl(lspx, opts.lsp);
   } else {
+    let input = Deno.stdin.readable;
+    let output = Deno.stdout.writable;
+    let lspx = yield* start({ input, output, ...opts, commands: opts.lsp });
     for (let [method] of yield* each(lspx.notifications)) {
       if (method === "exit") {
         break;