From 646653aa9a08c824e3f973bf7525b03d9afa52df Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 29 Jun 2015 19:21:01 +0300 Subject: [PATCH] Better deparenthesizing --- .../src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt index 089dda7e3b2..f3e064b0f12 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt @@ -283,6 +283,7 @@ public object KotlinNameSuggester { private fun MutableCollection.addNamesByExpression(expression: JetExpression?, validator: (String) -> Boolean) { if (expression == null) return + val expression = JetPsiUtil.safeDeparenthesize(expression) when (expression) { is JetSimpleNameExpression -> addCamelNames(expression.getReferencedName(), validator) @@ -291,8 +292,6 @@ public object KotlinNameSuggester { is JetCallExpression -> addNamesByExpression(expression.getCalleeExpression(), validator) is JetPostfixExpression -> addNamesByExpression(expression.getBaseExpression(), validator) - - is JetParenthesizedExpression -> addNamesByExpression(expression.getExpression(), validator) } }