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

Do not suggest renaming to underscore in 1.0 compatibility mode #KT-16019 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-01-27 17:32:50 +03:00
committed by mglukhikh
parent 67e207acb0
commit 5f455bbe3a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/RenameToUnderscoreFix.kt
+6 -1
View File
@@ -19,8 +19,10 @@ package org.jetbrains.kotlin.idea.quickfix
import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInsight.intention.IntentionAction
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.idea.project.languageVersionSettings
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
class RenameToUnderscoreFix(element: KtCallableDeclaration) : KotlinQuickFixAction<KtCallableDeclaration>(element) { class RenameToUnderscoreFix(element: KtCallableDeclaration) : KotlinQuickFixAction<KtCallableDeclaration>(element) {
@@ -48,7 +50,10 @@ class RenameToUnderscoreFix(element: KtCallableDeclaration) : KotlinQuickFixActi
else -> null else -> null
} }
if (declaration?.nameIdentifier == null) return null if (declaration?.nameIdentifier == null ||
!declaration.languageVersionSettings.supportsFeature(LanguageFeature.SingleUnderscoreForParameterName)) {
return null
}
return RenameToUnderscoreFix(declaration) return RenameToUnderscoreFix(declaration)
} }