azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"Wrap with let": minor enhancement (related to KT-6364)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-05-10 20:41:53 +03:00
parent b6564ed19a
commit 84d71e5a8c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/WrapWithSafeLetCallFix.kt
+6 -3
View File
@@ -51,10 +51,13 @@ class WrapWithSafeLetCallFix(
val validator = NewDeclarationNameValidator(element, nullableExpression, NewDeclarationNameValidator.Target.VARIABLES)
val name = KotlinNameSuggester.suggestNameByName("it", validator)
nullableExpression.replace(factory.createExpression(name))
val newExpression: Any = if (receiverExpression != null) "${receiverExpression.text}.${element.text}" else element
val underLetExpression = when {
receiverExpression != null -> factory.createExpressionByPattern("$0.$1", receiverExpression, element)
else -> element
}
val wrapped = when (name) {
"it" -> factory.createExpressionByPattern("$0?.let { $1 }", nullableText, newExpression)
else -> factory.createExpressionByPattern("$0?.let { $1 -> $2 }", nullableText, name, newExpression)
"it" -> factory.createExpressionByPattern("$0?.let { $1 }", nullableText, underLetExpression)
else -> factory.createExpressionByPattern("$0?.let { $1 -> $2 }", nullableText, name, underLetExpression)
}
(qualifiedExpression ?: element).replace(wrapped)
}