From 8ef83cfd13dc7dd4002498a7cae77f5e81aaabba Mon Sep 17 00:00:00 2001
From: SeeBasTStick <sebastian.stock@hhu.de>
Date: Thu, 3 Sep 2020 12:14:52 +0200
Subject: [PATCH] code beautification
---
.../server/communication/Communicator.kt | 2 +-
.../proBMangement/prob/ProBKernelManager.kt | 20 +++++++++++--------
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/kotlin/b/language/server/communication/Communicator.kt b/src/main/kotlin/b/language/server/communication/Communicator.kt
index 10fb9a7..4e8e8c3 100644
--- a/src/main/kotlin/b/language/server/communication/Communicator.kt
+++ b/src/main/kotlin/b/language/server/communication/Communicator.kt
@@ -33,7 +33,7 @@ object Communicator : CommunicatorInterface {
*/
override fun sendDebugMessage(message: String, severity: MessageType) {
if(debugMode) {
- System.err.println("Debug messages $message")
+ println("Debug messages: $message")
client.logMessage(MessageParams(severity, message))
}
diff --git a/src/main/kotlin/b/language/server/proBMangement/prob/ProBKernelManager.kt b/src/main/kotlin/b/language/server/proBMangement/prob/ProBKernelManager.kt
index 4370b32..6bd2fe1 100644
--- a/src/main/kotlin/b/language/server/proBMangement/prob/ProBKernelManager.kt
+++ b/src/main/kotlin/b/language/server/proBMangement/prob/ProBKernelManager.kt
@@ -49,13 +49,15 @@ class ProBKernelManager(private val communicator : CommunicatorInterface) : ProB
return if(probNewHome != probHome)
{
if(probNewHome == "DEFAULT"){ //Use default prob
- System.setProperty("prob.home", "null")
+ System.setProperty("prob.home", "DEFAULT")
kernel = setup()
probHome = probNewHome
true
}
else {
- if (File(probNewHome).exists()) { // Use custom prob
+
+ val dict = File(probNewHome)
+ if (dict.exists() && dict.isDirectory) { // Use custom prob
System.setProperty("prob.home", probNewHome)
kernel = setup()
probHome = probNewHome
@@ -82,14 +84,16 @@ class ProBKernelManager(private val communicator : CommunicatorInterface) : ProB
val path = URI(uri).path
Files.exists(Path.of(URI(uri)))
- communicator.sendDebugMessage("try to use ${settings.probHome} as prob version instead of ${System.getProperty("prob.home")}", MessageType.Info)
- // val result = checkProBVersionSetting(settings.probHome)
- // if(!result){
- // throw CouldNotFindProBHomeException("searched at ${settings.probHome} for prob but found nothing")
- //}
+ communicator.sendDebugMessage("try to use ${settings.probHome} as prob version instead of " +
+ System.getProperty("prob.home"), MessageType.Info)
+ val result = checkProBVersionSetting(settings.probHome)
+ if(!result){
+ throw CouldNotFindProBHomeException("searched at ${settings.probHome} for prob but found nothing")
+ }
communicator.sendDebugMessage("success!", MessageType.Info)
communicator.sendDebugMessage("checking document", MessageType.Info)
- return kernel.check(path, ProBSettings(wdChecks = settings.wdChecks, strictChecks = settings.strictChecks, performanceHints = settings.performanceHints))
+ return kernel.check(path, ProBSettings(wdChecks = settings.wdChecks, strictChecks = settings.strictChecks,
+ performanceHints = settings.performanceHints))
}
}
\ No newline at end of file
--
GitLab