PROPOSAL enhance REPL window handling

CHANGELOG.md

@@ -2,7 +2,12 @@
 Changes to Calva.
 
 ## [Unreleased]
-- [Fix floating promises](https://github.com/BetterThanTomorrow/calva/issues/411)
+- [Add commands for interrupting the current evaluation as well as all running evaluations](https://github.com/BetterThanTomorrow/calva/issues/237)
+- [Calva asks for user input when `stdin` needs it (e.g. `read-line`)](https://github.com/BetterThanTomorrow/calva/issues/377)
+- Command for clearing the REPL history reworked and now also ”restarts” the REPL window.
+- Commands are now added to REPL window history only if they are not identical to the previous command on the history stack.
+- [Fix floating promises in evelauation module](https://github.com/BetterThanTomorrow/calva/issues/411)
+- REPL Window Evaluation errors now initially hide the stack trace. The user can show it with a click.
 
 ## [2.0.54] - 2019-10-25
 - [Stop linting, start bundling clj-kondo](https://github.com/BetterThanTomorrow/calva/issues/423)

assets/styles/webview.scss

@@ -61,6 +61,20 @@ img {
   }
 }
 
+.userinput {
+  color: var(--vscode-editor-foreground);
+  background-color: var(--vscode-editor-background);
+  font-family: var(--vscode-editor-font-family);
+  font-size: var(--vscode-editor-font-size);
+  font-weight: var(--vscode-editor-font-weight);
+  border: none;
+  padding-top: 5px;
+}
+
+input[class*="userinput"]:focus {
+    outline: none;
+}
+
 .output {
   white-space: pre;
   color: var(--vscode-editorWarning-foreground);

assets/webview.html

@@ -37,8 +37,9 @@ <h3>Calva REPL – Powered by <a href="https://github.com/clojure-emacs/orchard"
         <!-- <p id="motd"></p> -->
         <p>The REPL prompt is a multiline, Paredit powered, Clojure editor. Some useful shortcuts are:
             <ul>
-                <li><code>alt+up/down</code>: for history navigation</li>
-                <li><code>alt+enter</code>: to submit the current line</li>
+                <li><code>alt+up/down</code>&nbsp; for history navigation</li>
+                <li><code>alt+enter</code>&nbsp; to submit the current line</li>
+                <li><code>ctrl+d</code>&nbsp; to interrupt a running evaluation</li>
             </ul>
         </p>
         <p><strong>NB:</strong> Make it a habit to start any Calva session by loading a file. Many things do not work before that is done. Use <code>ctrl+alt+c enter</code> in the code editor to load (evaluate) the active file.</p>

docs/readthedocs/source/connect.md

@@ -6,7 +6,7 @@ The recommended way is to:
 
 This way Calva can make sure it is started with the dependencies needed for a working Clojure and/or ClojureScript session. This is often referred to as **Jack in** (because that is what it is called in CIDER).
 
-Jack-in supports both CLJ and for CLJS, and has built-in configurations for **Leiningen**, **Clojure CLI**, and **shadow-cljs** projects, as well as for the CLJS repl types: **Figwheel Main**, **lein-fiwgheel** (legacy Figwheel), **shadow-cljs**, and Nashorn. Using jack-in provides your development environment with all the dependencies you need for Calva to work.
+Jack-in supports both CLJ and for CLJS, and has built-in configurations for **Leiningen**, **Clojure CLI**, and **shadow-cljs** projects, as well as for the CLJS repl types: **Figwheel Main**, **lein-figwheel** (legacy Figwheel), **shadow-cljs**, and Nashorn. Using jack-in provides your development environment with all the dependencies you need for Calva to work.
 
 It works like so:
 

docs/readthedocs/source/finding-commands.md

@@ -19,4 +19,4 @@ Now might be a good time to see [Calva Top 10 Commands](commands-top10.md)
 
 Did you know? There is a complete list of Calva settings and commands in the *Contributions* tab of the Calva entry in the *Extensions* pane in VS Code. 
 
-![The Clava Contributions Tab](https://user-images.githubusercontent.com/30010/66733740-c754b800-ee60-11e9-877b-962f6b920cd7.png)
+![The Calva Contributions Tab](https://user-images.githubusercontent.com/30010/66733740-c754b800-ee60-11e9-877b-962f6b920cd7.png)

package.json

@@ -592,8 +592,14 @@
                 "category": "Calva"
             },
             {
-                "command": "calva.clearREPLWindowHistory",
-                "title": "Clear history of active REPL window (mainly in case it has been borked)",
+                "command": "calva.clearClojureREPLWindow",
+                "title": "Clear Clojure REPL Window + History",
+                "enablement": "calva:connected",
+                "category": "Calva"
+            },
+            {
+                "command": "calva.clearClojureScriptREPLWindow",
+                "title": "Clear ClojureScript REPL Window + History",
                 "enablement": "calva:connected",
                 "category": "Calva"
             },
@@ -613,6 +619,12 @@
                 "title": "Clear Inline Evaluation Results",
                 "category": "Calva"
             },
+            {
+                "command": "calva.interruptAllEvaluations",
+                "title": "Interrupt running Evaluations",
+                "enablement": "calva:connected",
+                "category": "Calva"
+            },
             {
                 "command": "calva.evaluateSelection",
                 "title": "Evaluate Current Form",
@@ -995,6 +1007,10 @@
                 "key": "ctrl+alt+c e",
                 "win": "ctrl+alt+c v"
             },
+            {
+                "command": "calva.interruptAllEvaluations",
+                "key": "ctrl+alt+c ctrl+alt+d"
+            },
             {
                 "command": "calva.evaluateCurrentTopLevelForm",
                 "key": "ctrl+alt+c space"
@@ -1300,6 +1316,18 @@
                     "when": "false"
                 }
             ],
+            "editor/title": [
+                {
+                    "enablement": "editorLangId == clojure  && calva:connected",
+                    "command": "calva.loadFile",
+                    "group": "calva/b-eval"
+                },
+                {
+                    "enablement": "editorLangId == clojure && calva:connected",
+                    "command": "calva.loadNamespace",
+                    "group": "calva/b-eval"
+                }
+            ],
             "editor/context": [
                 {
                     "when": "editorLangId == clojure && !calva:connected",
@@ -1309,65 +1337,70 @@
                 {
                     "when": "editorLangId == clojure && calva:connected",
                     "command": "calva.disconnect",
-                    "group": "calva/x-disconnect"
-                },
-                {
-                    "when": "editorLangId == clojure",
-                    "command": "calva.togglePrettyPrint",
-                    "group": "calva/y-toggle"
+                    "group": "calva/x-connect"
                 },
                 {
                     "when": "editorLangId == clojure",
                     "command": "calva.selectCurrentForm",
                     "group": "calva/a-eval"
                 },
                 {
-                    "when": "editorLangId == clojure && calva:connected",
+                    "enablement": "editorLangId == clojure  && calva:connected",
+                    "command": "calva.loadFile",
+                    "group": "calva/b-eval"
+                },
+                {
+                    "enablement": "editorLangId == clojure && calva:connected",
+                    "command": "calva.loadNamespace",
+                    "group": "calva/b-eval"
+                },
+                {
+                    "enablement": "editorLangId == clojure && calva:connected",
                     "command": "calva.evaluateSelection",
                     "group": "calva/b-eval"
                 },
                 {
-                    "when": "editorLangId == clojure && calva:connected",
+                    "enablement": "editorLangId == clojure && calva:connected",
                     "command": "calva.evaluateCurrentTopLevelForm",
                     "group": "calva/b-eval"
                 },
                 {
-                    "when": "editorLangId == clojure && calva:connected",
+                    "enablement": "editorLangId == clojure && calva:connected",
                     "command": "calva.evaluateSelectionAsComment",
                     "group": "calva/b-eval"
                 },
                 {
-                    "when": "editorLangId == clojure && calva:connected",
+                    "enablement": "editorLangId == clojure && calva:connected",
                     "command": "calva.evaluateTopLevelFormAsComment",
                     "group": "calva/b-eval"
                 },
                 {
-                    "when": "editorLangId == clojure  && calva:connected",
-                    "command": "calva.loadFile",
-                    "group": "calva/c-load"
+                    "enablement": "editorLangId == clojure && calva:connected",
+                    "command": "calva.interruptAllEvaluations",
+                    "group": "calva/b-eval"
                 },
                 {
-                    "when": "editorLangId == clojure && calva:connected",
-                    "command": "calva.loadNamespace",
-                    "group": "calva/c-load"
+                    "when": "editorLangId == clojure",
+                    "command": "calva.togglePrettyPrint",
+                    "group": "calva/b-eval"
                 },
                 {
-                    "when": "editorLangId == clojure && calva:connected",
+                    "enablement": "editorLangId == clojure && calva:connected",
                     "command": "calva.runAllTests",
                     "group": "calva/d-test"
                 },
                 {
-                    "when": "editorLangId == clojure && calva:connected",
+                    "enablement": "editorLangId == clojure && calva:connected",
                     "command": "calva.runNamespaceTests",
                     "group": "calva/d-test"
                 },
                 {
-                    "when": "editorLangId == clojure && calva:connected",
+                    "enablement": "editorLangId == clojure && calva:connected",
                     "command": "calva.rerunTests",
                     "group": "calva/d-test"
                 },
                 {
-                    "when": "editorLangId == clojure && calva:connected",
+                    "enablement": "editorLangId == clojure && calva:connected",
                     "command": "calva.runTestUnderCursor",
                     "group": "calva/d-test"
                 }

src/connector.ts

@@ -13,6 +13,22 @@ import { NReplClient, NReplSession } from "./nrepl";
 import { reconnectReplWindow, openReplWindow, sendTextToREPLWindow, createReplWindow } from './repl-window';
 import { CljsTypeConfig, ReplConnectSequence, getDefaultCljsType, CljsTypes, askForConnectSequence } from './nrepl/connectSequence';
 
+function createAndConnectReplWindow(session: NReplSession, mode: "clj" | "cljs", ) {
+
+    createReplWindow(session, mode).then(() => {
+        openReplWindow(mode, true).then(() => {
+            reconnectReplWindow(mode).then(() => {
+            }).catch(e => {
+                console.error(`Failed reconnecting ${mode} REPL window: `, e);
+            });
+        }).catch(e => {
+            console.error(`Failed to open ${mode} REPL window: `, e);
+        })
+    }).catch((e) => {
+        console.error(`Failed to create ${mode} REPL window: `, e);
+    });
+}
+
 async function connectToHost(hostname, port, connectSequence: ReplConnectSequence) {
     state.analytics().logEvent("REPL", "Connecting").send();
 
@@ -38,27 +54,19 @@ async function connectToHost(hostname, port, connectSequence: ReplConnectSequenc
         })
         cljSession = nClient.session;
         chan.appendLine("Connected session: clj");
-        openReplWindow("clj", true).then( window => {
-            reconnectReplWindow("clj").catch(reason => {
-                console.error("Failed reconnecting REPL window: ", reason);
-            });
-        }).catch(e => {});
-
         util.setConnectingState(false);
         util.setConnectedState(true);
         state.analytics().logEvent("REPL", "ConnectedCLJ").send();
         state.cursor.set('clj', cljSession)
         state.cursor.set('cljc', cljSession)
         status.update();
-
 
+        createAndConnectReplWindow(cljSession, "clj");
         if (connectSequence.afterCLJReplJackInCode) {
             state.outputChannel().appendLine("Evaluating `afterCLJReplJackInCode` in CLJ REPL Window");
             await sendTextToREPLWindow("clj", connectSequence.afterCLJReplJackInCode, null, false);
         }
 
-        //cljsSession = nClient.session;
-        //terminal.createREPLTerminal('clj', null, chan);
         let cljsSession = null,
             cljsBuild = null;
         try {
@@ -70,15 +78,14 @@ async function connectToHost(hostname, port, connectSequence: ReplConnectSequenc
                 [cljsSession, cljsBuild] = await makeCljsSessionClone(cljSession, translatedReplType, connectSequence.name);
                 state.analytics().logEvent("REPL", "ConnectCljsRepl", isBuiltinType ? connectSequence.cljsType as string: "Custom").send();
             }
+            if (cljsSession) {
+                await setUpCljsRepl(cljsSession, chan, cljsBuild);
+            }  
+            chan.appendLine('cljc files will use the clj REPL.' + (cljsSession ? ' (You can toggle this at will.)' : ''));
         } catch (e) {
             chan.appendLine("Error while connecting cljs REPL: " + e);
         }
-        if (cljsSession)
-            await setUpCljsRepl(cljsSession, chan, cljsBuild);
-        chan.appendLine('cljc files will use the clj REPL.' + (cljsSession ? ' (You can toggle this at will.)' : ''));
-        //evaluate.loadFile();
         status.update();
-
     } catch (e) {
         util.setConnectingState(false);
         util.setConnectedState(false);
@@ -90,16 +97,11 @@ async function connectToHost(hostname, port, connectSequence: ReplConnectSequenc
     return true;
 }
 
-async function setUpCljsRepl(cljsSession, chan, build) {
-    state.cursor.set("cljs", cljsSession);
-    chan.appendLine("Connected session: cljs" + (build ? ", repl: " + build : ""));
-    await createReplWindow(cljsSession, "cljs");
-    openReplWindow("cljs", true).then( window => {
-        reconnectReplWindow("cljs").catch(reason => {
-            console.error("Failed reconnecting REPL window: ", reason);
-        });
-    }).catch(e => {});
+async function setUpCljsRepl(session, chan, build) {
+    state.cursor.set("cljs", session);
     status.update();
+    chan.appendLine("Connected session: cljs" + (build ? ", repl: " + build : ""));
+    createAndConnectReplWindow(session, "cljs");
 }
 
 function getFigwheelMainBuilds() {
@@ -273,7 +275,7 @@ function createCLJSReplType(cljsType: CljsTypeConfig, cljsTypeName: string, conn
                 }
             }
 
-            if (build != null) {
+            if ((typeof build == 'string') && build != "") {
                 initCode = updateInitCode(build, initCode);
                 if (!initCode) {
                     //TODO error message
@@ -475,7 +477,7 @@ function standaloneConnect(connectSequence: ReplConnectSequence, chan: vscode.Ou
         const cljsTypeName = projectTypes.getCljsTypeName(connectSequence);
         chan.appendLine(`Connecting ...`);
         state.analytics().logEvent("REPL", "StandaloneConnect", `${connectSequence.name} + ${cljsTypeName}`).send();
-        connect(connectSequence, false, false);
+        connect(connectSequence, false, false).catch( () => { } );
     }
     else {
         chan.appendLine("Aborting connect, error determining connect sequence.");