Skip to content

Commit 5c948d0

Browse files
committed
Test build
ReturnCount issue. Code converted from Java to Kotlin.
1 parent 8d8dc0b commit 5c948d0

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

detekt-config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ formatting:
66
continuationIndentSize: 8
77
ParameterListWrapping:
88
indentSize: 8
9+
style:
10+
ReturnCount:
11+
max: 42

src/main/kotlin/no/eirikb/avatest/actions/AvaJavaScriptTestRunnerRunConfigurationGenerator.kt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import com.intellij.psi.PsiElement
2020
import com.jetbrains.nodejs.run.NodeJsRunConfiguration
2121
import java.nio.file.Paths
2222

23+
fun JSCallExpression.isTest() = this.methodExpression?.text.equals("test")
24+
2325
class AvaJavaScriptTestRunnerRunConfigurationGenerator : AnAction() {
2426
private fun writeError(text: String) {
2527
val notification =
@@ -33,19 +35,18 @@ class AvaJavaScriptTestRunnerRunConfigurationGenerator : AnAction() {
3335
}
3436

3537
private fun getTestName(element: PsiElement?): String? {
36-
if (element == null) {
38+
if (element == null || element !is JSCallExpression) {
3739
return null
3840
}
39-
if (element is JSCallExpression) {
40-
val jsCallExpression: JSCallExpression = element
41-
val method: JSExpression? = jsCallExpression.methodExpression
42-
if (method?.text.equals("test")) {
43-
val arguments: Array<JSExpression> = jsCallExpression.arguments
44-
if (arguments.isNotEmpty()) {
45-
if (arguments[0] is JSLiteralExpression) {
46-
val expression: JSLiteralExpression = arguments[0] as JSLiteralExpression
47-
return expression.stringValue
48-
}
41+
42+
val jsCallExpression: JSCallExpression = element
43+
44+
if (jsCallExpression.isTest()) {
45+
val arguments: Array<JSExpression> = jsCallExpression.arguments
46+
if (arguments.isNotEmpty()) {
47+
if (arguments[0] is JSLiteralExpression) {
48+
val expression: JSLiteralExpression = arguments[0] as JSLiteralExpression
49+
return expression.stringValue
4950
}
5051
return null
5152
}

0 commit comments

Comments
 (0)