[K2] Properly report diagnostics on const properties with Java usages

#KT-63752
#KT-59894
#KT-61920 Fixed
This commit is contained in:
Ivan Kylchik
2023-11-21 15:15:58 +01:00
committed by Space Team
parent 9f64edb31e
commit 1125891a13
18 changed files with 255 additions and 83 deletions
@@ -23215,6 +23215,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/modifiers/const/fromJavaSubclass.kt");
}
@Test
@TestMetadata("fromJavaWithNonConstInitializer.kt")
public void testFromJavaWithNonConstInitializer() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/fromJavaWithNonConstInitializer.kt");
}
@Test
@TestMetadata("ifConstVal_after.kt")
public void testIfConstVal_after() throws Exception {
@@ -23215,6 +23215,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/modifiers/const/fromJavaSubclass.kt");
}
@Test
@TestMetadata("fromJavaWithNonConstInitializer.kt")
public void testFromJavaWithNonConstInitializer() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/fromJavaWithNonConstInitializer.kt");
}
@Test
@TestMetadata("ifConstVal_after.kt")
public void testIfConstVal_after() throws Exception {
@@ -23209,6 +23209,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/modifiers/const/fromJavaSubclass.kt");
}
@Test
@TestMetadata("fromJavaWithNonConstInitializer.kt")
public void testFromJavaWithNonConstInitializer() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/fromJavaWithNonConstInitializer.kt");
}
@Test
@TestMetadata("ifConstVal_after.kt")
public void testIfConstVal_after() throws Exception {
@@ -23215,6 +23215,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/modifiers/const/fromJavaSubclass.kt");
}
@Test
@TestMetadata("fromJavaWithNonConstInitializer.kt")
public void testFromJavaWithNonConstInitializer() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/fromJavaWithNonConstInitializer.kt");
}
@Test
@TestMetadata("ifConstVal_after.kt")
public void testIfConstVal_after() throws Exception {
@@ -128,7 +128,7 @@ internal fun checkConstantArguments(
//DO NOTHING
}
expressionSymbol is FirFieldSymbol -> {
if (!expressionSymbol.isStatic || expressionSymbol.modality != Modality.FINAL) {
if (!expressionSymbol.isStatic || expressionSymbol.modality != Modality.FINAL || !expressionSymbol.hasConstantInitializer) {
return ConstantArgumentKind.NOT_CONST
}
}
@@ -44,6 +44,7 @@ import org.jetbrains.kotlin.fir.resolve.transformers.SupertypeComputationSession
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.fir.utils.exceptions.withConeTypeEntry
import org.jetbrains.kotlin.load.java.structure.impl.NotEvaluatedConstAware
import org.jetbrains.kotlin.name.*
import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
import org.jetbrains.kotlin.resolve.jvm.KotlinFinderMarker
@@ -189,7 +190,7 @@ class FirJavaElementFinder(
private fun buildFieldStubForConst(firProperty: FirProperty, classStub: PsiClassStubImpl<ClsClassImpl>) {
if (!firProperty.isConst) return
val psiField = object : StubBase<PsiField>(classStub, JavaStubElementTypes.FIELD), PsiFieldStub {
val psiField = object : StubBase<PsiField>(classStub, JavaStubElementTypes.FIELD), PsiFieldStub, NotEvaluatedConstAware {
private val lazyInitializerText by lazy { propertyEvaluator?.invoke(firProperty) }
override fun getName(): String = firProperty.name.identifier
@@ -208,6 +209,10 @@ class FirJavaElementFinder(
override fun isDeprecated(): Boolean = false
override fun isEnumConstant(): Boolean = false
override fun isNotYetComputed(): Boolean {
return propertyEvaluator == null
}
}
PsiModifierListStubImpl(psiField, ModifierFlags.PUBLIC_MASK + ModifierFlags.FINAL_MASK + ModifierFlags.STATIC_MASK)
@@ -18,9 +18,6 @@ package org.jetbrains.kotlin.load.java.structure.impl;
import com.intellij.psi.PsiEnumConstant;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiVariable;
import com.intellij.psi.util.PsiUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.load.java.structure.JavaField;
@@ -28,12 +25,13 @@ import org.jetbrains.kotlin.load.java.structure.JavaType;
import org.jetbrains.kotlin.load.java.structure.impl.source.JavaElementPsiSource;
import org.jetbrains.kotlin.load.java.structure.impl.source.JavaElementSourceFactory;
import static org.jetbrains.kotlin.util.ConstUtils.isCompileTimeConstant;
public class JavaFieldImpl extends JavaMemberImpl<PsiField> implements JavaField {
public JavaFieldImpl(@NotNull JavaElementPsiSource<PsiField> psiFieldSource) {
super(psiFieldSource);
}
@SuppressWarnings("unused") // used in KSP
public JavaFieldImpl(PsiField psiField) {
this(JavaElementSourceFactory.getInstance(psiField.getProject()).createPsiSource(psiField));
@@ -59,7 +57,7 @@ public class JavaFieldImpl extends JavaMemberImpl<PsiField> implements JavaField
@Override
public boolean getHasConstantNotNullInitializer() {
// PsiUtil.isCompileTimeConstant returns false for null-initialized fields,
// see com.intellij.psi.util.IsConstantExpressionVisitor.visitLiteralExpression()
return PsiUtil.isCompileTimeConstant((PsiVariable) getPsi());
// see IsConstantExpressionVisitor.visitLiteralExpression()
return isCompileTimeConstant(getPsi());
}
}
@@ -0,0 +1,10 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.load.java.structure.impl
interface NotEvaluatedConstAware {
fun isNotYetComputed(): Boolean
}
@@ -0,0 +1,188 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.util;
import com.intellij.psi.*;
import com.intellij.psi.impl.compiled.ClsFieldImpl;
import com.intellij.psi.impl.java.stubs.PsiFieldStub;
import com.intellij.psi.impl.source.PsiFieldImpl;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.TypeConversionUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.load.java.structure.impl.NotEvaluatedConstAware;
import java.util.HashMap;
import java.util.Map;
public class ConstUtils {
// Copy paste from com.intellij.psi.util.PsiUtil.isCompileTimeConstant
public static boolean isCompileTimeConstant(@NotNull PsiVariable field) {
if (!field.hasModifierProperty(PsiModifier.FINAL)) return false;
PsiType type = field.getType();
return (TypeConversionUtil.isPrimitiveAndNotNull(type) || type.equalsToText(CommonClassNames.JAVA_LANG_STRING))
&& field.hasInitializer()
&& isConstantExpression(field.getInitializer());
}
// Copy paste from com.intellij.psi.util.PsiUtil.isConstantExpression
private static boolean isConstantExpression(@Nullable PsiExpression expression) {
if (expression == null) return false;
IsConstantExpressionVisitor visitor = new IsConstantExpressionVisitor();
expression.accept(visitor);
return visitor.isConstant();
}
}
// Copy of `com.intellij.psi.util.IsConstantExpressionVisitor`.
// This copy is required to be able to handle K2 constants without triggering constant evaluation.
// The only change is done in `visitReferenceExpression` where we check for constant expression without triggering evaluation.
final class IsConstantExpressionVisitor extends JavaElementVisitor {
private boolean myIsConstant;
private final Map<PsiVariable, Boolean> varIsConst = new HashMap<>();
public boolean isConstant() {
return myIsConstant;
}
@Override
public void visitExpression(PsiExpression expression) {
myIsConstant = false;
}
@Override
public void visitLiteralExpression(PsiLiteralExpression expression) {
myIsConstant = !"null".equals(expression.getText());
}
@Override
public void visitClassObjectAccessExpression(PsiClassObjectAccessExpression expression) {
myIsConstant = true;
}
@Override
public void visitParenthesizedExpression(PsiParenthesizedExpression expression) {
PsiExpression expr = expression.getExpression();
if (expr != null) {
expr.accept(this);
}
}
@Override
public void visitTypeCastExpression(PsiTypeCastExpression expression) {
PsiExpression operand = expression.getOperand();
if (operand == null) {
myIsConstant = false;
return;
}
operand.accept(this);
if (!myIsConstant) return;
PsiTypeElement element = expression.getCastType();
if (element == null) {
myIsConstant = false;
return;
}
PsiType type = element.getType();
if (type instanceof PsiPrimitiveType) return;
if (type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) return;
myIsConstant = false;
}
@Override
public void visitPrefixExpression(PsiPrefixExpression expression) {
PsiExpression operand = expression.getOperand();
if (operand == null) {
myIsConstant = false;
return;
}
operand.accept(this);
if (!myIsConstant) return;
IElementType opType = expression.getOperationTokenType();
if (opType == JavaTokenType.PLUS || opType == JavaTokenType.MINUS || opType == JavaTokenType.TILDE || opType == JavaTokenType.EXCL) {
return;
}
myIsConstant = false;
}
@Override
public void visitPolyadicExpression(PsiPolyadicExpression expression) {
for (PsiExpression operand : expression.getOperands()) {
operand.accept(this);
if (!myIsConstant) return;
final PsiType type = operand.getType();
if (type != null && !(type instanceof PsiPrimitiveType) && !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
myIsConstant = false;
return;
}
}
}
@Override
public void visitConditionalExpression(PsiConditionalExpression expression) {
PsiExpression thenExpr = expression.getThenExpression();
PsiExpression elseExpr = expression.getElseExpression();
if (thenExpr == null || elseExpr == null) {
myIsConstant = false;
return;
}
expression.getCondition().accept(this);
if (!myIsConstant) return;
thenExpr.accept(this);
if (!myIsConstant) return;
elseExpr.accept(this);
}
@Override
public void visitReferenceExpression(PsiReferenceExpression expression) {
PsiExpression qualifierExpression = expression.getQualifierExpression();
if (qualifierExpression != null && !(qualifierExpression instanceof PsiReferenceExpression)) {
myIsConstant = false;
return;
}
PsiElement refElement = expression.resolve();
if (!(refElement instanceof PsiVariable)) {
myIsConstant = false;
return;
}
PsiVariable variable = (PsiVariable)refElement;
Boolean isConst = varIsConst.get(variable);
if (isConst != null) {
myIsConstant &= isConst.booleanValue();
return;
}
if (variable instanceof PsiEnumConstant) {
myIsConstant = true;
varIsConst.put(variable, Boolean.TRUE);
return;
}
varIsConst.put(variable, Boolean.FALSE);
if (!variable.hasModifierProperty(PsiModifier.FINAL)){
myIsConstant = false;
return;
}
// This block is the only difference with the original `IsConstantExpressionVisitor`
if (variable instanceof ClsFieldImpl) {
PsiFieldStub stub = ((ClsFieldImpl) variable).getStub();
if (stub instanceof NotEvaluatedConstAware && ((NotEvaluatedConstAware) stub).isNotYetComputed()) {
myIsConstant = true;
varIsConst.put(variable, Boolean.TRUE);
return;
}
}
// END
variable.hasInitializer();
PsiExpression initializer = PsiFieldImpl.getDetachedInitializer(variable);
if (initializer == null){
myIsConstant = false;
return;
}
initializer.accept(this);
varIsConst.put(variable, myIsConstant);
}
}
@@ -1,25 +0,0 @@
// FILE: Test.java
public class Test {
public static int i1 = 1;
public static final int i2 = 1;
public static final int i3 = i1;
public static final int i4 = i2;
public static int i5 = i1;
public static int i6 = i2;
public final int i7 = 1;
}
// FILE: a.kt
annotation class Ann(vararg val i: Int)
@Ann(
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>Test.i1<!>,
Test.i2,
Test.i3,
Test.i4,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>Test.i5<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>Test.i6<!>,
<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>Test().i7<!>
)
class A
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// FILE: Test.java
public class Test {
public static int i1 = 1;
@@ -1,26 +0,0 @@
// FILE: A.java
public class A {
public static final int X = 1;
public static final int Y;
public final int z = 3;
static {
Y = 2;
}
}
// FILE: main.kt
annotation class Ann(val x: Int)
@Ann(A.X)
fun main1() {}
@Ann(A.Y)
fun main2() {}
val q = A()
@Ann(<!ANNOTATION_ARGUMENT_MUST_BE_CONST!>q.z<!>)
fun main3() {}
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// FILE: A.java
public class A {
@@ -0,0 +1,10 @@
// FIR_IDENTICAL
// TARGET_BACKEND: JVM
// FILE: Foo.java
public interface Foo {
public static final long A = System.currentTimeMillis();
}
// FILE: test.kt
const val b = <!CONST_VAL_WITH_NON_CONST_INITIALIZER!>Foo.A<!>
@@ -1,3 +1,6 @@
// IGNORE_REVERSED_RESOLVE
// IGNORE_CONTRACT_VIOLATIONS
// See KT-63752 about ignores
// FIR_IDENTICAL
// FILE: Bar.java
@@ -1,24 +0,0 @@
// TARGET_BACKEND: JVM
// FILE: Bar.java
package one.two;
public class Bar {
public static final int BAR1 = SOME_WRONG_EXPRESSION;
public static final int BAR2 = MainKt.FOO + 1;
public static final int BAR3 = Doo.DOO + 1;
}
// FILE: Main.kt
package one.two
const val FOO = 1
class Doo {
companion object {
const val DOO = 1
}
}
const val BAZ1 = Bar.BAR1 + 1
const val BAZ2 = Bar.BAR2 + 1
const val BAZ3 = Bar.BAR3 + 1
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// TARGET_BACKEND: JVM
// FILE: Bar.java
package one.two;
@@ -23215,6 +23215,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/modifiers/const/fromJavaSubclass.kt");
}
@Test
@TestMetadata("fromJavaWithNonConstInitializer.kt")
public void testFromJavaWithNonConstInitializer() throws Exception {
runTest("compiler/testData/diagnostics/tests/modifiers/const/fromJavaWithNonConstInitializer.kt");
}
@Test
@TestMetadata("ifConstVal_after.kt")
public void testIfConstVal_after() throws Exception {