Skip to content

Commit

Permalink
Kapt: Analyze sources again if the received analysis result is 'Retry…
Browse files Browse the repository at this point in the history 
…WithAdditionalJavaRoots'. ->

Add additional Java roots to Java source roots and clear diagnostic messages before the next analysis round.
(cherry picked from commit 17ad807)
  • Loading branch information
@yanex
yanex committed Aug 29, 2016
1 parent 884e653 commit 84d62f3
Show file tree
Hide file tree
Showing 12 changed files with 93 additions and 27 deletions.
5 changes: 5 additions & 0 deletions ...li/cli-common/src/org/jetbrains/kotlin/cli/common/messages/FilteringMessageCollector.java
View file
Expand Up @@ -28,6 +28,11 @@ public FilteringMessageCollector(@NotNull MessageCollector messageCollector, @No
this.decline = decline;
}

@Override
public void clear() {
messageCollector.clear();
}

@Override
public void report(
@NotNull CompilerMessageSeverity severity, @NotNull String message, @NotNull CompilerMessageLocation location
Expand Down
5 changes: 5 additions & 0 deletions ...cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/GroupingMessageCollector.java
View file
Expand Up @@ -33,6 +33,11 @@ public GroupingMessageCollector(@NotNull MessageCollector delegate) {
this.delegate = delegate;
}

@Override
public void clear() {
groupedMessages.clear();
}

@Override
public void report(
@NotNull CompilerMessageSeverity severity,
Expand Down
7 changes: 7 additions & 0 deletions compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollector.java
View file
Expand Up @@ -25,12 +25,19 @@ public void report(@NotNull CompilerMessageSeverity severity, @NotNull String me
// Do nothing
}

@Override
public void clear() {
// Do nothing
}

@Override
public boolean hasErrors() {
return false;
}
};

void clear();

void report(@NotNull CompilerMessageSeverity severity, @NotNull String message, @NotNull CompilerMessageLocation location);

boolean hasErrors();
Expand Down
5 changes: 5 additions & 0 deletions compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/PrintingMessageCollector.java
View file
Expand Up @@ -32,6 +32,11 @@ public PrintingMessageCollector(@NotNull PrintStream errStream, @NotNull Message
this.messageRenderer = messageRenderer;
}

@Override
public void clear() {
// Do nothing, messages are already reported
}

@Override
public void report(
@NotNull CompilerMessageSeverity severity,
Expand Down
2 changes: 1 addition & 1 deletion compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
View file
Expand Up @@ -64,7 +64,7 @@ class CliLightClassGenerationSupport(project: Project) : LightClassGenerationSup
private var bindingContext: BindingContext by Delegates.notNull()
private var module: ModuleDescriptor by Delegates.notNull()


override fun initialize(trace: BindingTrace, module: ModuleDescriptor, codeAnalyzer: KotlinCodeAnalyzer) {
this.bindingContext = trace.bindingContext
this.module = module
Expand Down
12 changes: 6 additions & 6 deletions compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt
View file
Expand Up @@ -58,16 +58,16 @@ interface JvmDependenciesIndex {
): Set<String>
}

interface JvmDependenciesIndexFactory {
fun makeIndexFor(roots: List<JavaRoot>): JvmDependenciesIndex
interface JvmDependenciesIndexFactory<out T : JvmDependenciesIndex> {
fun makeIndexFor(roots: List<JavaRoot>): T
}

class JvmStaticDependenciesIndexFactory : JvmDependenciesIndexFactory {
override fun makeIndexFor(roots: List<JavaRoot>): JvmDependenciesIndex = JvmDependenciesIndexImpl(roots)
class JvmStaticDependenciesIndexFactory : JvmDependenciesIndexFactory<JvmDependenciesIndex> {
override fun makeIndexFor(roots: List<JavaRoot>) = JvmDependenciesIndexImpl(roots)
}

class JvmUpdatableDependenciesIndexFactory : JvmDependenciesIndexFactory {
override fun makeIndexFor(roots: List<JavaRoot>): JvmDependenciesIndex = JvmDependenciesDynamicCompoundIndex().apply {
class JvmUpdatableDependenciesIndexFactory : JvmDependenciesIndexFactory<JvmDependenciesDynamicCompoundIndex> {
override fun makeIndexFor(roots: List<JavaRoot>) = JvmDependenciesDynamicCompoundIndex().apply {
addIndex(JvmDependenciesIndexImpl(roots))
}
}
Expand Down
32 changes: 14 additions & 18 deletions compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
View file
Expand Up @@ -107,9 +107,9 @@ class KotlinCoreEnvironment private constructor(
}
}
private val sourceFiles = ArrayList<KtFile>()
private val rootsIndex: JvmDependenciesIndex
private val rootsIndex: JvmDependenciesDynamicCompoundIndex

val configuration: CompilerConfiguration = configuration.copy().apply { setReadOnly(true) }
val configuration: CompilerConfiguration = configuration.copy()

init {
PersistentFSConstants.setMaxIntellisenseFileSize(FileUtilRt.LARGE_FOR_CONTENT_LOADING)
Expand Down Expand Up @@ -154,11 +154,9 @@ class KotlinCoreEnvironment private constructor(
}

val initialRoots = configuration.getList(JVMConfigurationKeys.CONTENT_ROOTS).classpathRoots()

// TODO: pass index factory in the configuration to avoid selection logic here
// for a moment using updatable index for REPL mode, so we can add roots to classpath then compiling subsequent lines in REPL
val indexFactory = if (configuration.getBoolean(CommonConfigurationKeys.REPL_MODE)) JvmUpdatableDependenciesIndexFactory()
else JvmStaticDependenciesIndexFactory()

// REPL and kapt2 update classpath dynamically
val indexFactory = JvmUpdatableDependenciesIndexFactory()

rootsIndex = indexFactory.makeIndexFor(initialRoots)
updateClasspathFromRootsIndex(rootsIndex)
Expand Down Expand Up @@ -226,19 +224,17 @@ class KotlinCoreEnvironment private constructor(
projectEnvironment.addSourcesToClasspath(it.file)
}
}

fun updateClasspath(roots: List<ContentRoot>): List<File>? {
return rootsIndex.addNewIndexForRoots(roots.classpathRoots())?.let {
updateClasspathFromRootsIndex(it)
it.indexedRoots.mapNotNull { File(it.file.path.substringBefore(URLUtil.JAR_SEPARATOR)) }.toList()
} ?: emptyList()
}

@Suppress("unused") // used externally
fun tryUpdateClasspath(files: Iterable<File>): List<File>? =
if (rootsIndex !is JvmDependenciesDynamicCompoundIndex) {
report(WARNING, "Unable to update classpath after initialization, it is only allowed in REPL")
null
}
else {
rootsIndex.addNewIndexForRoots(files.map { JvmClasspathRoot(it) }.classpathRoots())?.let {
updateClasspathFromRootsIndex(it)
it.indexedRoots.mapNotNull { File(it.file.path.substringBefore(URLUtil.JAR_SEPARATOR)) }.toList()
} ?: emptyList()
}
@Deprecated("Use updateClasspath() instead.", ReplaceWith("updateClasspath(files)"))
fun tryUpdateClasspath(files: Iterable<File>): List<File>? = updateClasspath(files.map(::JvmClasspathRoot))

fun contentRootToVirtualFile(root: JvmContentRoot): VirtualFile? {
when (root) {
Expand Down
32 changes: 30 additions & 2 deletions compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
View file
Expand Up @@ -18,6 +18,8 @@ package org.jetbrains.kotlin.cli.jvm.compiler

import com.intellij.openapi.util.io.JarUtil
import org.jetbrains.annotations.TestOnly
import com.intellij.psi.PsiManager
import com.intellij.psi.impl.PsiModificationTrackerImpl
import org.jetbrains.kotlin.analyzer.AnalysisResult
import org.jetbrains.kotlin.asJava.FilteredJvmDiagnostics
import org.jetbrains.kotlin.backend.common.output.OutputFileCollection
Expand All @@ -34,6 +36,8 @@ import org.jetbrains.kotlin.codegen.ClassBuilderFactories
import org.jetbrains.kotlin.codegen.CompilationErrorHandler
import org.jetbrains.kotlin.codegen.GeneratedClassLoader
import org.jetbrains.kotlin.codegen.KotlinCodegenFacade
import org.jetbrains.kotlin.cli.jvm.config.*
import org.jetbrains.kotlin.codegen.*
import org.jetbrains.kotlin.codegen.state.GenerationState
import org.jetbrains.kotlin.codegen.state.GenerationStateEventCallback
import org.jetbrains.kotlin.config.CompilerConfiguration
Expand Down Expand Up @@ -124,7 +128,26 @@ object KotlinToJVMBytecodeCompiler {
}

val targetDescription = "in targets [" + chunk.joinToString { input -> input.getModuleName() + "-" + input.getModuleType() } + "]"
val result = analyze(environment, targetDescription)
var result = analyze(environment, targetDescription)

if (result is AnalysisResult.RetryWithAdditionalJavaRoots) {
val oldReadOnlyValue = projectConfiguration.isReadOnly
projectConfiguration.isReadOnly = false
projectConfiguration.addJavaSourceRoots(result.additionalJavaRoots)
projectConfiguration.isReadOnly = oldReadOnlyValue

environment.updateClasspath(result.additionalJavaRoots.map { JavaSourceRoot(it, null) })

// Clear package caches (see KotlinJavaPsiFacade)
(PsiManager.getInstance(environment.project).modificationTracker as? PsiModificationTrackerImpl)?.incCounter()

// Clear all diagnostic messages
projectConfiguration[CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY]?.clear()

// Repeat analysis with additional Java roots (kapt generated sources)
result = analyze(environment, targetDescription)
}

if (result == null || !result.shouldGenerateCode) return false

ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()
Expand Down Expand Up @@ -402,7 +425,12 @@ object KotlinToJVMBytecodeCompiler {

K2JVMCompiler.reportPerf(environment.configuration, message)

return if (analyzerWithCompilerReport.hasErrors()) null else analyzerWithCompilerReport.analysisResult
val analysisResult = analyzerWithCompilerReport.analysisResult

return if (!analyzerWithCompilerReport.hasErrors() || analysisResult is AnalysisResult.RetryWithAdditionalJavaRoots)
analysisResult
else
null
}

private fun generate(
Expand Down
7 changes: 7 additions & 0 deletions compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt
View file
Expand Up @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.analyzer
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.types.ErrorUtils
import java.io.File

open class AnalysisResult protected constructor(
val bindingContext: BindingContext,
Expand Down Expand Up @@ -58,6 +59,12 @@ open class AnalysisResult protected constructor(
}

private class Error(bindingContext: BindingContext, val exception: Throwable) : AnalysisResult(bindingContext, ErrorUtils.getErrorModule())

class RetryWithAdditionalJavaRoots(
bindingContext: BindingContext,
moduleDescriptor: ModuleDescriptor,
val additionalJavaRoots: List<File>
) : AnalysisResult(bindingContext, moduleDescriptor)

companion object {
val EMPTY: AnalysisResult = success(BindingContext.EMPTY, ErrorUtils.getErrorModule())
Expand Down
4 changes: 4 additions & 0 deletions compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfiguration.java
View file
Expand Up @@ -122,6 +122,10 @@ public void setReadOnly(boolean readOnly) {
this.readOnly = readOnly;
}
}

public boolean isReadOnly() {
return readOnly;
}

@NotNull
private static <T> T unmodifiable(@NotNull T object) {
Expand Down
5 changes: 5 additions & 0 deletions compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java
View file
Expand Up @@ -44,6 +44,11 @@ public void report(
throw new AssertionError(MessageRenderer.PLAIN_FULL_PATHS.render(severity, message, location));
}

@Override
public void clear() {
// Do nothing
}

@Override
public boolean hasErrors() {
throw new UnsupportedOperationException();
Expand Down
4 changes: 4 additions & 0 deletions jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
View file
Expand Up @@ -707,6 +707,10 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
))
}

override fun clear() {
hasErrors = false
}

override fun hasErrors(): Boolean = hasErrors

private fun renderLocationIfNeeded(location: CompilerMessageLocation): String {
Expand Down

0 comments on commit 84d62f3

Please sign in to comment.