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

Redundant curly braces in string template: do not report labeled 'this'

Browse Source 
#KT-35475 Fixed
This commit is contained in:
Toshiaki Kameyama
2019-12-17 17:57:24 +09:00
committed by Dmitry Gridin
parent 80d29cdad1
commit fabeca5955
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiModificationUtils.kt
+5 -2
View File
@@ -542,8 +542,11 @@ fun KtModifierList.normalize(): KtModifierList {
}
}
fun KtBlockStringTemplateEntry.canDropBraces() =
(expression is KtNameReferenceExpression || expression is KtThisExpression) && canPlaceAfterSimpleNameEntry(nextSibling)
fun KtBlockStringTemplateEntry.canDropBraces(): Boolean {
val expression = this.expression
return (expression is KtNameReferenceExpression || (expression is KtThisExpression && expression.labelQualifier == null))
&& canPlaceAfterSimpleNameEntry(nextSibling)
}
fun KtBlockStringTemplateEntry.dropBraces(): KtSimpleNameStringTemplateEntry {
val name = if (expression is KtThisExpression) {