Skip to content

Commit c5fbadd

Browse files
committed
update tests to use tryEval
1 parent 6f49085 commit c5fbadd

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

src/eval-region.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,9 @@ const startEdgeProp = NodeProp.closedBy
2020
const endEdgeProp = NodeProp.openedBy
2121
const sameEdgeProp = props.sameEdge
2222

23-
function up(node) {
24-
return node.parent;
25-
}
23+
const up = (node) => node.parent;
2624

27-
function isTopType(nodeType) {
28-
return nodeType.isTop;
29-
}
25+
const isTopType = (nodeType) => nodeType.isTop
3026

3127
function isTop(node) {
3228
return isTopType(node.type);
@@ -131,9 +127,9 @@ function updateEditor(view, text, pos) {
131127
})
132128
}
133129

134-
function tryEval(ctx, s) {
130+
export function tryEval(ctx, s) {
135131
try {
136-
return evalString(ctx, s)
132+
return evalString(ctx, s).trim()
137133
} catch (err) {
138134
console.log(err)
139135
return "\nError: " + err.message

test/lang-clojure-eval.test.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { describe, expect, test, it } from 'vitest'
2-
import { EditorState } from "@codemirror/state"
3-
import { evalString, sciInit } from "../src/sci"
4-
import { clojure } from "../src/clojure"
5-
1+
import {describe, expect, test, it} from 'vitest'
2+
import {EditorState} from "@codemirror/state"
3+
import {sciInit} from "../src/sci"
4+
import {tryEval} from "../src/eval-region"
5+
import {clojure} from "../src/clojure"
6+
67
describe('Editor state', () => {
78
let state = EditorState.create({
89
doc: `(map inc (range 5))`,
@@ -14,6 +15,6 @@ describe('Editor state', () => {
1415

1516
it('Evaluates Clojure code', () => {
1617
let ctx = sciInit()
17-
expect(evalString(ctx, state.doc.text[0])).eq("(1 2 3 4 5)")
18+
expect(tryEval(ctx, state.doc.text[0])).eq("(1 2 3 4 5)")
1819
})
1920
})

0 commit comments

Comments
 (0)