RdFault: add @nls annotations

JetBrains · Jun 17, 2021 · b4e62ba · b4e62ba
1 parent ff15a4d
commit b4e62ba
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/buildSrc/src/main/kotlin/com/jetbrains/rd/gradle/plugins/MultiplatformPlugin.kt b/buildSrc/src/main/kotlin/com/jetbrains/rd/gradle/plugins/MultiplatformPlugin.kt
@@ -64,6 +64,7 @@ open class MultiplatformPlugin : Plugin<Project> {
                     dependencies {
                         implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
                         implementation("org.jetbrains.kotlin:kotlin-reflect")
+//                        implementation("org.jetbrains:annotations:20.1.0")
                     }
                 }
                 val jvmTest by getting {

diff --git a/rd-kt/rd-core/src/commonMain/kotlin/com/jetbrains/rd/util/reactive/RdFault.kt b/rd-kt/rd-core/src/commonMain/kotlin/com/jetbrains/rd/util/reactive/RdFault.kt
@@ -1,12 +1,12 @@
 package com.jetbrains.rd.util.reactive
 
 import com.jetbrains.rd.util.ExecutionException
-import com.jetbrains.rd.util.getThrowableText
 
+expect class RdFault constructor(reasonTypeFqn: String, reasonMessage: String, reasonAsText: String, reason: Throwable? = null) :
+    ExecutionException {
+    val reasonTypeFqn: String
+    val reasonMessage: String
+    val reasonAsText: String
 
-class RdFault constructor(val reasonTypeFqn: String, val reasonMessage: String, val reasonAsText: String, reason: Throwable? = null)
-    : ExecutionException(reasonMessage + if (reason == null)  ", reason: $reasonAsText" else "", reason) {
-
-    constructor (reason: Throwable) : this (reason::class.simpleName?:"", reason.message ?: "-- no message --", reason.getThrowableText(), reason) {
-    }
+    constructor(reason: Throwable)
 }
diff --git a/rd-kt/rd-core/src/jsMain/kotlin/com/jetbrains/rd/util/reactive/RdFault.kt b/rd-kt/rd-core/src/jsMain/kotlin/com/jetbrains/rd/util/reactive/RdFault.kt
@@ -0,0 +1,15 @@
+package com.jetbrains.rd.util.reactive
+
+import com.jetbrains.rd.util.ExecutionException
+import com.jetbrains.rd.util.getThrowableText
+
+actual class RdFault actual constructor(
+    actual val reasonTypeFqn: String,
+    actual val reasonMessage: String,
+    actual val reasonAsText: String,
+    reason: Throwable?
+) : ExecutionException(reasonMessage + if (reason == null)  ", reason: $reasonAsText" else "", reason) {
+
+    actual constructor (reason: Throwable) : this (reason::class.simpleName?:"", reason.message ?: "-- no message --", reason.getThrowableText(), reason) {
+    }
+}
diff --git a/rd-kt/rd-core/src/jvmMain/kotlin/com/jetbrains/rd/util/reactive/RdFault.kt b/rd-kt/rd-core/src/jvmMain/kotlin/com/jetbrains/rd/util/reactive/RdFault.kt
@@ -0,0 +1,16 @@
+package com.jetbrains.rd.util.reactive
+
+import com.jetbrains.rd.util.ExecutionException
+import com.jetbrains.rd.util.getThrowableText
+import org.jetbrains.annotations.Nls
+
+actual class RdFault actual constructor(
+    actual val reasonTypeFqn: String,
+    @Nls actual val reasonMessage: String,
+    @Nls actual val reasonAsText: String,
+    reason: Throwable?
+) : ExecutionException(reasonMessage + if (reason == null)  ", reason: $reasonAsText" else "", reason) {
+
+    actual constructor (reason: Throwable) : this (reason::class.simpleName?:"", reason.message ?: "-- no message --", reason.getThrowableText(), reason) {
+    }
+}