pretty print/truncate eval results

bobbicodes · Jun 28, 2023 · 205f7a3 · 205f7a3
1 parent ffaf575
commit 205f7a3
Show file tree

Hide file tree

Showing 10 changed files with 1,643 additions and 4,753 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,8 @@ Alpha. Certainly contains bugs. There is a [live demo](https://bobbicodes.github
 - ✅ Create test suite
 - ✅ Test published package
 - ✅ Handle errors
-- [ ] Truncate very long eval results
+- ✅ Pretty-print eval result
+- ✅ Truncate very long eval result
 - [ ] Handle infinite loops
 
 ## Run demo locally

diff --git a/dist/assets/index-1ed6b52a.js b/dist/assets/index-1ed6b52a.js
diff --git a/dist/assets/index-53d4dbe5.js b/dist/assets/index-53d4dbe5.js
diff --git a/dist/index.html b/dist/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/lang-clojure-eval/assets/vite-4a748afd.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite App</title>
-    <script type="module" crossorigin src="/lang-clojure-eval/assets/index-1ed6b52a.js"></script>
+    <script type="module" crossorigin src="/lang-clojure-eval/assets/index-53d4dbe5.js"></script>
     <link rel="stylesheet" href="/lang-clojure-eval/assets/index-b488241e.css">
   </head>
   <body>

diff --git a/dist/js/sci.js b/dist/js/sci.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lang-clojure-eval",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "author": "Bobbi Towers <[email protected]>",
   "description": "Lezer-based Clojure Codemirror 6 extension with live evaluation",
   "main": "dist/index.cjs",

diff --git a/public/js/sci.js b/public/js/sci.js
diff --git a/src/eval-region.js b/src/eval-region.js
@@ -131,6 +131,13 @@ function updateEditor(view, text, pos) {
     })
 }
 
+function splitResult(s) {
+    if (s.length > 100) {
+       return "\n" + s.substring(0, 100) + "..." + s.substring(s.length -2)
+    }
+    return s
+}
+
 function tryEval(ctx, s) {
     try {
         return evalString(ctx, s)
@@ -146,7 +153,7 @@ function evalAtCursor(view) {
     posBeforeEval = view.state.selection.main.head
     const codeBeforeCursor = codeBeforeEval.slice(0, posBeforeEval)
     const codeAfterCursor = codeBeforeEval.slice(posBeforeEval, codeBeforeEval.length)
-    evalResult = tryEval(ctx, cursorNodeString(view.state))
+    evalResult = splitResult(tryEval(ctx, cursorNodeString(view.state)))
     const codeWithResult = codeBeforeCursor + " => " + evalResult + " " + codeAfterCursor
     updateEditor(view, codeWithResult, posBeforeEval)
     view.dispatch({selection: {anchor: posBeforeEval, head: posBeforeEval}})
@@ -167,15 +174,15 @@ function evalTopLevel(view) {
     codeBeforeEval = doc
     const codeBeforeFormEnd = codeBeforeEval.slice(0, posAtFormEnd)
     const codeAfterFormEnd = codeBeforeEval.slice(posAtFormEnd, codeBeforeEval.length)
-    evalResult = tryEval(ctx, topLevelString(view.state))
+    evalResult = splitResult(tryEval(ctx, topLevelString(view.state)))
     const codeWithResult = codeBeforeFormEnd + " => " + evalResult + " " + codeAfterFormEnd
     updateEditor(view, codeWithResult, posBeforeEval)
     return true
 }
 
 function evalCell(view) {
     const doc = view.state.doc.toString()
-    evalResult = tryEval(ctx, view.state.doc.text.join(" "))
+    evalResult = splitResult(tryEval(ctx, view.state.doc.text.join(" ")))
     const codeWithResult = doc + "\n" + " => " + evalResult
     updateEditor(view, codeWithResult, posBeforeEval)
     //console.log("evalCell>", evalString(ctx, view.state.doc.text.join(" ")))

diff --git a/src/lang_clojure_eval/main.cljs b/src/lang_clojure_eval/main.cljs
@@ -1,8 +1,11 @@
 (ns lang-clojure-eval.main
-  (:require [sci.core :as sci]))
+  (:require [sci.core :as sci]
+            [clojure.pprint :as pprint]))
 
 (defn sci-init []
   (sci/init {}))
 
 (defn eval-string [ctx s]
-  (str (sci/eval-string* ctx s)))
+  (with-out-str (pprint/pprint (sci/eval-string* ctx s))))
+
+
diff --git a/src/sci.js b/src/sci.js