From 2ea089f0d2b1ba244890908e507d1cf2cdfd2463 Mon Sep 17 00:00:00 2001 From: "Aleksei.Cherepanov" Date: Tue, 12 Oct 2021 19:00:36 +0300 Subject: [PATCH] [CHERRY PICKED FROM IJ] Fix incremental build after changing Java const used as class property Report Java static final constant with InlineConstantTracker, used as class property in Kotlin for further registration in JPS. Add tests. #KT-49177 Fixed GitOrigin-RevId: 01a58cf10f5419d70f0d80cbaa9bcd9732ff0547 Original commit: https://github.com/JetBrains/intellij-community/commit/d077f3b3217c8d88518fec7249228cb29df2e0ff --- .../javaUsedInKotlin/constantChanged/JavaClass.java | 6 ++++-- .../javaUsedInKotlin/constantChanged/JavaClass.java.new | 6 ++++-- .../withJava/javaUsedInKotlin/constantChanged/usage.kt | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java index d0fda426b81..82fe695ad2c 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java @@ -1,5 +1,7 @@ public class JavaClass { public class Inner { - public static final String CONST = "A"; + public class InnerInner { + public static final String CONST = "A"; + } } -} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new index 7cb5ca220d2..fd1f9078bd2 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new @@ -1,5 +1,7 @@ public class JavaClass { public class Inner { - public static final String CONST = "B"; + public class InnerInner { + public static final String CONST = "B"; + } } -} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt index 36e9a2b02f2..94a44fe22c1 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt @@ -1,4 +1,4 @@ -import JavaClass.Inner.CONST +import JavaClass.Inner.InnerInner.CONST fun main() { val myKotlinConst = CONST