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

Redundant curly braces in string template: remove braces for 'this'

Browse Source 
#KT-32972 Fixed
This commit is contained in:
Toshiaki Kameyama
2019-07-26 22:23:50 +09:00
committed by Dmitry Gridin
parent 8f2a73b734
commit 7c2f6ecba7
5 changed files with 24 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
+6 -2
View File
@@ -558,10 +558,14 @@ fun KtModifierList.normalize(): KtModifierList {
}
fun KtBlockStringTemplateEntry.canDropBraces() =
expression is KtNameReferenceExpression && canPlaceAfterSimpleNameEntry(nextSibling)
(expression is KtNameReferenceExpression || expression is KtThisExpression) && canPlaceAfterSimpleNameEntry(nextSibling)
fun KtBlockStringTemplateEntry.dropBraces(): KtSimpleNameStringTemplateEntry {
val name = (expression as KtNameReferenceExpression).getReferencedNameElement().text
val name = if (expression is KtThisExpression) {
KtTokens.THIS_KEYWORD.value
} else {
(expression as KtNameReferenceExpression).getReferencedNameElement().text
}
val newEntry = KtPsiFactory(this).createSimpleNameStringTemplateEntry(name)
return replaced(newEntry)
}