Skip to content

Commit

Permalink
Use private setter instead of separate backing field
Browse files Browse the repository at this point in the history
  • Loading branch information
rock3r authored and arturbosch committed Oct 7, 2018
1 parent 769de0b commit 0e84710
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,32 +16,32 @@ import org.jetbrains.kotlin.psi.psiUtil.getCallNameExpression
*/
class McCabeVisitor(private val ignoreSimpleWhenEntries: Boolean) : DetektVisitor() {

private var _mcc: Int = 0

val mcc: Int
get() = _mcc
var mcc: Int = 0
private set(value) {
field = value
}

override fun visitNamedFunction(function: KtNamedFunction) {
_mcc++
mcc++
super.visitNamedFunction(function)
}

override fun visitIfExpression(expression: KtIfExpression) {
_mcc++
mcc++
if (expression.`else` != null) {
_mcc++
mcc++
}
super.visitIfExpression(expression)
}

override fun visitLoopExpression(loopExpression: KtLoopExpression) {
_mcc++
mcc++
super.visitLoopExpression(loopExpression)
}

override fun visitWhenExpression(expression: KtWhenExpression) {
val entries = expression.extractEntries(ignoreSimpleWhenEntries)
_mcc += if (ignoreSimpleWhenEntries && entries.count() == 0) 1 else entries.count()
mcc += if (ignoreSimpleWhenEntries && entries.count() == 0) 1 else entries.count()
super.visitWhenExpression(expression)
}

Expand All @@ -51,10 +51,10 @@ class McCabeVisitor(private val ignoreSimpleWhenEntries: Boolean) : DetektVisito
}

override fun visitTryExpression(expression: KtTryExpression) {
_mcc++
_mcc += expression.catchClauses.size
mcc++
mcc += expression.catchClauses.size
expression.finallyBlock?.let {
_mcc++
mcc++
Unit
}
super.visitTryExpression(expression)
Expand All @@ -66,7 +66,7 @@ class McCabeVisitor(private val ignoreSimpleWhenEntries: Boolean) : DetektVisito
if (lambdaArguments.size > 0) {
val lambdaArgument = lambdaArguments[0]
lambdaArgument.getLambdaExpression()?.bodyExpression?.let {
_mcc++
mcc++
Unit
}
}
Expand Down
2 changes: 1 addition & 1 deletion detekt-cli/src/main/resources/default-detekt-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ complexity:
active: true
threshold: 10
ignoreSingleWhenExpression: false
simpleWhenEntryWeight: 0.5
ignoreSimpleWhenEntries: false
LabeledExpression:
active: false
LargeClass:
Expand Down

0 comments on commit 0e84710

Please sign in to comment.