refactor to use arrow functions

bobbicodes · bobbicodes · commit 8675b460ae59 · 2023-06-29T01:31:43.000-07:00
diff --git a/dist/assets/index-7592d1ba.js b/dist/assets/index-7592d1ba.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-63be8dd0.js"></script>
+    <script type="module" crossorigin src="/lang-clojure-eval/assets/index-7592d1ba.js"></script>
     <link rel="stylesheet" href="/lang-clojure-eval/assets/index-b488241e.css">
   </head>
   <body>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lang-clojure-eval",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "author": "Bobbi Towers <btowers793@gmail.com>",
   "description": "Lezer-based Clojure Codemirror 6 extension with live evaluation",
   "main": "dist/index.cjs",
diff --git a/src/eval-region.js b/src/eval-region.js
@@ -19,18 +19,10 @@ const prefixContainerProp = props.prefixContainer
 const startEdgeProp = NodeProp.closedBy
 const endEdgeProp = NodeProp.openedBy
 const sameEdgeProp = props.sameEdge
-
 const up = (node) => node.parent;
-
 const isTopType = (nodeType) => nodeType.isTop
-
-function isTop(node) {
-    return isTopType(node.type);
-}
-
-function mainSelection(state) {
-    return state.selection.asSingle().ranges[0]
-}
+const isTop = (node) => isTopType(node.type)
+const mainSelection = (state) => state.selection.asSingle().ranges[0]
 
 function tree(state, pos, dir) {
     switch (arguments["length"]) {
@@ -43,24 +35,19 @@ function tree(state, pos, dir) {
     }
 }
 
-function nearestTouching(state, pos) {
-    const L = tree(state, pos, -1)
-    const R = tree(state, pos, 1)
-    const mid = tree(state, pos)
-    return L
-}
+const nearestTouching = (state, pos) => tree(state, pos, -1)
 
-function isTerminalType(nodeType) {
+const isTerminalType = (nodeType) => {
     if (isTopType(nodeType || nodeType.prefixCollProp.prop() ||
-    nodeType.collProp.prop() || nodeType.name == "Meta" ||
-    nodeType.name == "TaggedLiteral" || nodeType.name == "ConstructorCall")) {
+        nodeType.collProp.prop() || nodeType.name == "Meta" ||
+        nodeType.name == "TaggedLiteral" || nodeType.name == "ConstructorCall")) {
         return false
     } else {
         return true
     }
 }
 
-function children(parent, from, dir) {
+const children = (parent, from, dir) => {
     let child = parent.childBefore(from)
     return children(parent, child.from).unshift(child)
 }
@@ -70,12 +57,10 @@ function parents(node, p) {
     return parents(up(node), p.concat(node));
 }
 
-function rangeStr(state, selection) {
-    return state.doc.slice(selection.from, selection.to).toString()
-}
+const rangeStr = (state, selection) => state.doc.slice(selection.from, selection.to).toString()
 
 // Return node or its highest parent that ends at the cursor position
- function uppermostEdge(pos, node) {
+function uppermostEdge(pos, node) {
     const p = parents(node, []).filter(n => pos == n.to && pos == node.to);
     return p[p.length - 1] || node
 }
@@ -103,13 +88,8 @@ function topLevelNode(state) {
     }
 }
 
-function cursorNodeString(state) {
-    return rangeStr(state, nodeAtCursor(state))
-}
-
-function topLevelString(state) {
-    return rangeStr(state, topLevelNode(state))
-}
+const cursorNodeString = (state) => rangeStr(state, nodeAtCursor(state))
+const topLevelString = (state) => rangeStr(state, topLevelNode(state))
 
 let evalResult = ""
 let codeBeforeEval = ""
@@ -172,7 +152,6 @@ function evalCell(view) {
     evalResult = tryEval(view.state.doc.text.join(" "))
     const codeWithResult = doc + "\n" + " => " + evalResult
     updateEditor(view, codeWithResult, posBeforeEval)
-    //console.log("evalCell>", evalString(ctx, view.state.doc.text.join(" ")))
     return true
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "lang-clojure-eval",`
`3`		`- "version": "0.0.16",`
	`3`	`+ "version": "0.0.17",`
`4`	`4`	`"author": "Bobbi Towers <[email protected]>",`
`5`	`5`	`"description": "Lezer-based Clojure Codemirror 6 extension with live evaluation",`
`6`	`6`	`"main": "dist/index.cjs",`