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

KT-38829 Add additional check to RemoveRedundantBackticksQuickFix

Browse Source 
- Identifier's name can change between reporting of inspection and
applying a quickfix
- ^KT-38829 Fixed
This commit is contained in:
Roman Golyshev
2020-05-09 03:50:32 +03:00
committed by Roman Golyshev
parent 6034fcdc46
commit 225d354604
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/RemoveRedundantBackticksInspection.kt
+12 -13
View File
@@ -19,7 +19,6 @@ import com.intellij.codeInspection.LocalQuickFix
import com.intellij.codeInspection.ProblemDescriptor import com.intellij.codeInspection.ProblemDescriptor
import com.intellij.codeInspection.ProblemHighlightType import com.intellij.codeInspection.ProblemHighlightType
import com.intellij.codeInspection.ProblemsHolder import com.intellij.codeInspection.ProblemsHolder
import com.intellij.lang.ASTNode
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiElementVisitor
@@ -38,7 +37,7 @@ class RemoveRedundantBackticksInspection : AbstractKotlinInspection() {
override fun visitKtElement(element: KtElement) { override fun visitKtElement(element: KtElement) {
super.visitKtElement(element) super.visitKtElement(element)
SharedImplUtil.getChildrenOfType(element.node, KtTokens.IDENTIFIER).forEach { SharedImplUtil.getChildrenOfType(element.node, KtTokens.IDENTIFIER).forEach {
if (isRedundantBackticks(it)) { if (isRedundantBackticks(it.text)) {
registerProblem(holder, it.psi) registerProblem(holder, it.psi)
} }
} }
@@ -46,16 +45,6 @@ class RemoveRedundantBackticksInspection : AbstractKotlinInspection() {
} }
} }
private fun isKeyword(text: String): Boolean =
text == "yield" || text.all { it == '_' } || (KtTokens.KEYWORDS.types + KtTokens.SOFT_KEYWORDS.types).any { it.toString() == text }
private fun isRedundantBackticks(node: ASTNode): Boolean {
val text = node.text
if (!(text.startsWith("`") && text.endsWith("`"))) return false
val unquotedText = text.unquote()
return unquotedText.isIdentifier() && !isKeyword(unquotedText)
}
private fun registerProblem(holder: ProblemsHolder, element: PsiElement) { private fun registerProblem(holder: ProblemsHolder, element: PsiElement) {
holder.registerProblem( holder.registerProblem(
element, element,
@@ -72,7 +61,17 @@ class RemoveRedundantBackticksQuickFix : LocalQuickFix {
override fun applyFix(project: Project, descriptor: ProblemDescriptor) { override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
val element = descriptor.psiElement val element = descriptor.psiElement
if (!isRedundantBackticks(element.text)) return
val factory = KtPsiFactory(project) val factory = KtPsiFactory(project)
element.replace(factory.createIdentifier(element.text.removePrefix("`").removeSuffix("`"))) element.replace(factory.createIdentifier(element.text.unquote()))
} }
} }
private fun isKeyword(text: String): Boolean =
text == "yield" || text.all { it == '_' } || (KtTokens.KEYWORDS.types + KtTokens.SOFT_KEYWORDS.types).any { it.toString() == text }
private fun isRedundantBackticks(identifier: String): Boolean {
if (!(identifier.startsWith("`") && identifier.endsWith("`"))) return false
val unquotedText = identifier.unquote()
return unquotedText.isIdentifier() && !isKeyword(unquotedText)
}