From 6c7a6bf3b1397b8d2ade4feeb476d66b1bb813b3 Mon Sep 17 00:00:00 2001
From: "Aleksei.Cherepanov" <aleksei.cherepanov@jetbrains.com>
Date: Fri, 17 Sep 2021 18:45:02 +0300
Subject: [PATCH] [CHERRY PICKED FROM IJ] Simplify API for InlineConstTracker
 and add testdata

GitOrigin-RevId: b2bcde9e3102d575ca459f475c00022515b6ccba
Original commit: https://github.com/JetBrains/intellij-community/commit/f78e98d1ba5b6c142076b67f88c54282c3964c7f
---
 .../kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt       | 2 +-
 .../javaUsedInKotlin/constantChanged/JavaClass.java        | 7 -------
 .../javaUsedInKotlin/constantChanged/JavaClass.java.new    | 7 -------
 .../withJava/javaUsedInKotlin/constantChanged/build.log    | 2 +-
 .../constantChanged/org/jetbrains/JavaClass.java           | 7 +++++++
 .../constantChanged/org/jetbrains/JavaClass.java.new       | 7 +++++++
 .../withJava/javaUsedInKotlin/constantChanged/usage.kt     | 2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java
 delete mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new
 create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java
 create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java.new

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
index c3c1a8a8fb0..374124eff41 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt
@@ -367,7 +367,7 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB
 
                 // process inlineConstTracker
                 for (sourceFile: File in sourceFiles) {
-                    val cRefs = inlineConstTracker.inlineConstMap[sourceFile.path]?.map { cRef ->
+                    val cRefs = inlineConstTracker.inlineConstMap[sourceFile.path]?.map { cRef: ConstantRef ->
                         val descriptor = when (cRef.constType) {
                             "Byte" -> "B"
                             "Short" -> "S"
diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java
deleted file mode 100644
index 82fe695ad2c..00000000000
--- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    public class Inner {
-        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
deleted file mode 100644
index fd1f9078bd2..00000000000
--- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new
+++ /dev/null
@@ -1,7 +0,0 @@
-public class JavaClass {
-    public class Inner {
-        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/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log
index 551eb3388b1..d63dd1871e0 100644
--- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log
+++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log
@@ -8,7 +8,7 @@ End of files
 Exit code: NOTHING_DONE
 ------------------------------------------
 Compiling files:
-  src/JavaClass.java
+  src/org/jetbrains/JavaClass.java
 End of files
 Cleaning output files:
   out/production/module/META-INF/module.kotlin_module
diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java
new file mode 100644
index 00000000000..fa6c7f29eea
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java
@@ -0,0 +1,7 @@
+package org.jetbrains;
+
+public class JavaClass {
+    public class Inner {
+        public static final String CONST = "A";
+    }
+}
diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java.new
new file mode 100644
index 00000000000..159ba67b7c0
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/org/jetbrains/JavaClass.java.new
@@ -0,0 +1,7 @@
+package org.jetbrains;
+
+public class JavaClass {
+    public class Inner {
+        public static final String CONST = "B";
+    }
+}
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 94a44fe22c1..e29c3fa0f42 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.InnerInner.CONST
+import org.jetbrains.JavaClass.Inner.CONST
 
 fun main() {
     val myKotlinConst = CONST