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

Remove unnecessary lateinit intention / inspection removed (supported in compiler CFA instead)

Browse Source 
(cherry picked from commit e17f222)
This commit is contained in:
Mikhail Glukhikh
2016-09-26 12:01:08 +03:00
committed by Mikhail Glukhikh
parent 67cc83af05
commit 4522d2c7da
26 changed files with 0 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
-13
View File
@@ -1314,11 +1314,6 @@
<category>Kotlin</category>
</intentionAction>
<intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.RemoveUnnecessaryLateinitIntention</className>
<category>Kotlin</category>
</intentionAction>
<intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.RemoveSingleExpressionStringTemplateIntention</className>
<category>Kotlin</category>
@@ -1736,14 +1731,6 @@
language="kotlin"
/>
<localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveUnnecessaryLateinitInspection"
displayName="Unnecessary lateinit"
groupName="Kotlin"
enabledByDefault="true"
level="WARNING"
language="kotlin"
/>
<localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.conventionNameCalls.ReplaceCallWithComparisonInspection"
displayName="Can be replaced with comparison"
groupName="Kotlin"
idea/src/org/jetbrains/kotlin/idea/intentions/RemoveUnnecessaryLateinitIntention.kt
-90
View File
@@ -1,90 +0,0 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.intentions
import com.intellij.codeInspection.ProblemHighlightType
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.util.TextRange
import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully
import org.jetbrains.kotlin.idea.conversion.copy.range
import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtBinaryExpression
import org.jetbrains.kotlin.psi.KtClass
import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtProperty
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
class RemoveUnnecessaryLateinitInspection : IntentionBasedInspection<KtProperty>(RemoveUnnecessaryLateinitIntention::class) {
override val problemHighlightType = ProblemHighlightType.LIKE_UNUSED_SYMBOL
override val problemText = "Unnecessary lateinit"
}
class RemoveUnnecessaryLateinitIntention : SelfTargetingRangeIntention<KtProperty>(KtProperty::class.java, "Remove unnecessary lateinit") {
override fun applicabilityRange(element: KtProperty): TextRange? {
if (!element.hasModifier(KtTokens.LATEINIT_KEYWORD)) return null
val ktClass = element.getStrictParentOfType<KtClass>() ?: return null
if (ktClass.getAnonymousInitializers().any { hasAssignmentStatements(it.body, element) }) {
return element.lateinitTextRange()
}
if (ktClass.hasPrimaryConstructor()) return null
val secondaryConstructors = ktClass.getSecondaryConstructors()
val secondaryConstructorsInfo = secondaryConstructors.map { secondaryConstructor ->
val delegationCall = secondaryConstructor.getDelegationCall()
val hasAssignmentStatements = hasAssignmentStatements(secondaryConstructor.bodyExpression, element)
if (!hasAssignmentStatements && !delegationCall.isCallToThis) return null
val resolvedCall = delegationCall.getResolvedCall(delegationCall.analyzeFully()) ?: return null
val delegationCallIndex = secondaryConstructors.indexOfFirst {
DescriptorToSourceUtils.descriptorToDeclaration(resolvedCall.resultingDescriptor) == it
}
SecondaryConstructorInfo(hasAssignmentStatements, delegationCallIndex)
}
return if (assignmentReachableFromAnySecondaryConstructor(secondaryConstructorsInfo)) element.lateinitTextRange()
else null
}
private fun assignmentReachableFromAnySecondaryConstructor(constructorsInfo: List<SecondaryConstructorInfo>): Boolean {
constructorsInfo.forEach {
val visitedInfo = hashSetOf<SecondaryConstructorInfo>()
var currentConstructor = it
while (!currentConstructor.hasAssignmentStatement) {
if (!visitedInfo.add(currentConstructor)) return false
currentConstructor = constructorsInfo.getOrNull(currentConstructor.delegationCallIndex) ?: return false
}
}
return true
}
private fun KtProperty.lateinitTextRange() = modifierList?.getModifier(KtTokens.LATEINIT_KEYWORD)?.range
private fun hasAssignmentStatements(body: KtExpression?, property: KtProperty) =
body?.children?.any {
it is KtBinaryExpression &&
it.operationToken === KtTokens.EQ &&
it.left?.text == property.name
} ?: false
override fun applyTo(element: KtProperty, editor: Editor?) {
element.removeModifier(KtTokens.LATEINIT_KEYWORD)
}
}
private data class SecondaryConstructorInfo(val hasAssignmentStatement: Boolean, val delegationCallIndex: Int)