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

add quickfix for NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-09-25 14:36:54 +02:00
parent 743c59331d
commit 250456ab4b
10 changed files with 100 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/ConstModifierChecker.kt
+24 -17
View File
@@ -16,11 +16,14 @@
package org.jetbrains.kotlin.resolve
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.DiagnosticSink
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.JetDeclaration
import org.jetbrains.kotlin.psi.JetProperty
public object ConstModifierChecker : DeclarationChecker {
override fun check(
@@ -31,44 +34,48 @@ public object ConstModifierChecker : DeclarationChecker {
) {
if (descriptor !is VariableDescriptor || !declaration.hasModifier(JetTokens.CONST_KEYWORD)) return
val containingDeclaration = descriptor.containingDeclaration
val constModifierPsiElement = declaration.modifierList!!.getModifier(JetTokens.CONST_KEYWORD)!!
val diagnostic = checkCanBeConst(declaration, constModifierPsiElement, descriptor)
if (diagnostic != null) {
diagnosticHolder.report(diagnostic)
}
}
fun checkCanBeConst(declaration: JetDeclaration,
constModifierPsiElement: PsiElement,
descriptor: VariableDescriptor): Diagnostic? {
if (descriptor.isVar) {
diagnosticHolder.report(Errors.WRONG_MODIFIER_TARGET.on(constModifierPsiElement, JetTokens.CONST_KEYWORD, "vars"))
return
return Errors.WRONG_MODIFIER_TARGET.on(constModifierPsiElement, JetTokens.CONST_KEYWORD, "vars")
}
val containingDeclaration = descriptor.containingDeclaration
if (containingDeclaration is ClassDescriptor && containingDeclaration.kind != ClassKind.OBJECT) {
diagnosticHolder.report(Errors.CONST_VAL_NOT_TOP_LEVEL_OR_OBJECT.on(constModifierPsiElement))
return
return Errors.CONST_VAL_NOT_TOP_LEVEL_OR_OBJECT.on(constModifierPsiElement)
}
if (declaration !is JetProperty || descriptor !is PropertyDescriptor) return
if (declaration !is JetProperty || descriptor !is PropertyDescriptor) return null
if (declaration.hasDelegate()) {
diagnosticHolder.report(Errors.CONST_VAL_WITH_DELEGATE.on(declaration.delegate!!))
return
return Errors.CONST_VAL_WITH_DELEGATE.on(declaration.delegate!!)
}
if (descriptor is PropertyDescriptor && !descriptor.getter!!.isDefault) {
diagnosticHolder.report(Errors.CONST_VAL_WITH_GETTER.on(declaration.getter!!))
return
return Errors.CONST_VAL_WITH_GETTER.on(declaration.getter!!)
}
if (!descriptor.type.canBeUsedForConstVal()) {
diagnosticHolder.report(Errors.TYPE_CANT_BE_USED_FOR_CONST_VAL.on(constModifierPsiElement, descriptor.type))
return
return Errors.TYPE_CANT_BE_USED_FOR_CONST_VAL.on(constModifierPsiElement, descriptor.type)
}
if (declaration.initializer == null) {
diagnosticHolder.report(Errors.CONST_VAL_WITHOUT_INITIALIZER.on(constModifierPsiElement))
return
return Errors.CONST_VAL_WITHOUT_INITIALIZER.on(constModifierPsiElement)
}
if (descriptor.compileTimeInitializer == null) {
diagnosticHolder.report(Errors.CONST_VAL_WITH_NON_CONST_INITIALIZER.on(declaration.initializer!!))
return
return Errors.CONST_VAL_WITH_NON_CONST_INITIALIZER.on(declaration.initializer!!)
}
return null
}
}