From b7b9149a06b97000cc920b7b58a08217ee68df78 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Mon, 16 Nov 2020 15:42:14 +0800
Subject: [PATCH] Don't show stacktrace for IllegalArgument failure
---
.../src/ConsoleThread.kt | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/frontend/mirai-console-terminal/src/ConsoleThread.kt b/frontend/mirai-console-terminal/src/ConsoleThread.kt
index 3ab02d5a4..b6cdcaa28 100644
--- a/frontend/mirai-console-terminal/src/ConsoleThread.kt
+++ b/frontend/mirai-console-terminal/src/ConsoleThread.kt
@@ -71,19 +71,11 @@ internal fun startupConsoleThread() {
when (val result = ConsoleCommandSender.executeCommand(next)) {
is Success -> {
}
- is IllegalArgument -> {
- result.exception.message?.let { msg ->
- val err = result.exception
- if ((err.suppressed?.size ?: 0) != 0) {
- // 该 IllegalArgument 错误还存在其他附加错误
- consoleLogger.warning(result.exception)
- } else {
- consoleLogger.warning(msg)
- err.cause?.let { consoleLogger.warning(it) }
- }
- } ?: kotlin.run {
- consoleLogger.warning(result.exception)
- }
+ is IllegalArgument -> { // user wouldn't want stacktrace for a parser error unless it is in debugging mode (to do).
+ val message = result.exception.message
+ if (message != null) {
+ consoleLogger.warning(message)
+ } else consoleLogger.warning(result.exception)
}
is ExecutionFailed -> {
consoleLogger.error(result.exception)