Skip to content

More features #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Disabled history expansion also for pasteConsole (relates to #31)
merged 12 commits into from
Apr 24, 2018
Merged

More features #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1eab6d7
Switch to JLine3
khud Apr 11, 2018
5cd4121
Shaded jline3, REPL API improvements, syntax highlighting
khud Apr 12, 2018
7a3b360
syntax on/off command, highlighter tests
khud Apr 13, 2018
bc976af
Configurable styles for highlighter
khud Apr 14, 2018
4fe3114
Enable highlighting for commands
khud Apr 16, 2018
196a301
Fix init ordering
khud Apr 17, 2018
df5d61a
Informative runtime error
khud Apr 17, 2018
967b6c3
Simplify error message
khud Apr 17, 2018
e1b53d6
Customize prompt
khud Apr 18, 2018
0489367
Small fixes and import command
khud Apr 22, 2018
2e092e8
Improve list symbols
khud Apr 24, 2018
5f74eef
Enable prompt plugin in Spark
khud Apr 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Informative runtime error
  • Loading branch information
@khud
khud committed Apr 17, 2018
commit df5d61a3ddfe41b28f59c9ab8abe832e10e8df1c
2 changes: 1 addition & 1 deletion kshell-repl-api/src/main/kotlin/sparklin/kshell/repl/ReplEvaluator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ open class ReplEvaluator(
scriptInstance
}
catch (e: Throwable) {
return Result.Error(EvalError.RuntimeError(e.message ?: e.javaClass.canonicalName, e as? Exception))
return Result.Error(EvalError.RuntimeError(e.message ?: e.cause?.message ?: e.javaClass.canonicalName, e.cause as? Exception))
}

commitSnippets(state, data.snippets)
Expand Down
9 changes: 6 additions & 3 deletions kshell/src/main/kotlin/sparklin/kshell/KShell.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,12 @@ open class KShell(val disposable: Disposable,
})
}

fun handleError(error: EvalError) {
println("Message: ${error.message}")
}
fun handleError(error: EvalError) = when (error) {
is EvalError.RuntimeError -> {
if (error.cause != null) error.cause?.printStackTrace() else println("Runtime Error: ${error.message}")
}
is EvalError.CompileError -> println("Compile Error: ${error.message}")
}

fun handleSuccess(result: EvalResult) {
if (result is EvalResult.ValueResult)
Expand Down