From 5f455bbe3afb5fa25272141bae982f5da1d7c90e Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 27 Jan 2017 17:32:50 +0300 Subject: [PATCH] Do not suggest renaming to underscore in 1.0 compatibility mode #KT-16019 Fixed --- .../kotlin/idea/quickfix/RenameToUnderscoreFix.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameToUnderscoreFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameToUnderscoreFix.kt index b780bdbc5c4..914e40b680d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameToUnderscoreFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameToUnderscoreFix.kt @@ -19,8 +19,10 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.intention.IntentionAction import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project +import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Errors +import org.jetbrains.kotlin.idea.project.languageVersionSettings import org.jetbrains.kotlin.psi.* class RenameToUnderscoreFix(element: KtCallableDeclaration) : KotlinQuickFixAction(element) { @@ -48,7 +50,10 @@ class RenameToUnderscoreFix(element: KtCallableDeclaration) : KotlinQuickFixActi else -> null } - if (declaration?.nameIdentifier == null) return null + if (declaration?.nameIdentifier == null || + !declaration.languageVersionSettings.supportsFeature(LanguageFeature.SingleUnderscoreForParameterName)) { + return null + } return RenameToUnderscoreFix(declaration) }