javac-wrapper: constant evaluator

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt

@@ -149,7 +149,7 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
     var useJavac: Boolean by FreezableVar(false)
 
     @Argument(value = "-Xcompile-java", description = "Reuse javac analysis and compile Java source files")
-    public boolean compileJava;
+    var compileJava by FreezableVar(false)
 
     @Argument(
             value = "-Xjavac-arguments",

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt

@@ -253,7 +253,7 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
 
     private fun compileJavaFilesIfNeeded(environment: KotlinCoreEnvironment,
                                          arguments: K2JVMCompilerArguments): Boolean  {
-        if (arguments.useJavac) {
+        if (arguments.compileJava) {
             return JavacWrapper.getInstance(environment.project).use { it.compile() }
         }
         return true

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt

@@ -279,7 +279,7 @@ class KotlinCoreEnvironment private constructor(
             bootClasspath: List<File>? = null,
             sourcePath: List<File>? = null
     ): Boolean {
-        return JavacWrapperRegistrar.registerJavac(projectEnvironment.project, configuration, javaFiles, kotlinFiles, arguments, bootClasspath, sourcePath, CliLightClassGenerationSupport(project))
+        return JavacWrapperRegistrar.registerJavac(projectEnvironment.project, configuration, javaFiles, kotlinFiles, arguments, bootClasspath, sourcePath, LightClassGenerationSupport.getInstance(project))
     }
 
     private val applicationEnvironment: CoreApplicationEnvironment

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperKotlinResolverImpl.kt

@@ -17,8 +17,9 @@
 package org.jetbrains.kotlin.cli.jvm.javac
 
 import com.intellij.psi.PsiClass
+import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
 import org.jetbrains.kotlin.asJava.classes.KtLightClass
-import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport
+import org.jetbrains.kotlin.asJava.findFacadeClass
 import org.jetbrains.kotlin.javac.JavacWrapperKotlinResolver
 import org.jetbrains.kotlin.javac.resolve.MockKotlinField
 import org.jetbrains.kotlin.load.java.structure.JavaField
@@ -26,8 +27,9 @@ import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtClassOrObject
+import org.jetbrains.kotlin.psi.KtFile
 
-class JavacWrapperKotlinResolverImpl(private val lightClassGenerationSupport: CliLightClassGenerationSupport) : JavacWrapperKotlinResolver {
+class JavacWrapperKotlinResolverImpl(private val lightClassGenerationSupport: LightClassGenerationSupport) : JavacWrapperKotlinResolver {
 
     private val cache = hashMapOf<KtClassOrObject, KtLightClass>()
 
@@ -44,6 +46,12 @@ class JavacWrapperKotlinResolverImpl(private val lightClassGenerationSupport: Cl
         return lightClass.allFields.find { it.name == name}?.let(::MockKotlinField)
     }
 
+    override fun findField(ktFile: KtFile?, name: String): JavaField? {
+        val lightClass = ktFile?.findFacadeClass() ?: return null
+
+        return lightClass.allFields.find { it.name == name}?.let(::MockKotlinField)
+    }
+
     private fun KtClassOrObject.getLightClass(): KtLightClass? =
         cache[this] ?: lightClassGenerationSupport.getLightClass(this)?.also { cache[this] = it }
 

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperRegistrar.kt

@@ -18,9 +18,9 @@ package org.jetbrains.kotlin.cli.jvm.javac
 
 import com.intellij.mock.MockProject
 import com.sun.tools.javac.util.Context
+import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.STRONG_WARNING
-import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport
 import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
@@ -40,7 +40,7 @@ object JavacWrapperRegistrar {
             arguments: Array<String>?,
             bootClasspath: List<File>?,
             sourcePath: List<File>?,
-            lightClassGenerationSupport: CliLightClassGenerationSupport
+            lightClassGenerationSupport: LightClassGenerationSupport
     ): Boolean {
         val messageCollector = configuration.getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)