Refactor CompilerConfiguration: keys -> Content roots

Represent classpath roots and java source roots as separate entities
This commit is contained in:
Pavel V. Talanov
2015-03-31 20:13:59 +03:00
parent 4e283fd62f
commit cb7617b3ca
29 changed files with 265 additions and 143 deletions
@@ -19,13 +19,14 @@ package org.jetbrains.kotlin.asJava;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.config.CommonConfigurationKeys;
import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment;
import java.io.File;
import java.util.List;
import static org.jetbrains.kotlin.config.ConfigPackage.addKotlinSourceRoot;
public abstract class KotlinAsJavaTestBase extends KotlinTestWithEnvironment {
protected JavaElementFinder finder;
@@ -34,7 +35,7 @@ public abstract class KotlinAsJavaTestBase extends KotlinTestWithEnvironment {
CompilerConfiguration configuration = new CompilerConfiguration();
for (File root : getKotlinSourceRoots()) {
configuration.add(CommonConfigurationKeys.SOURCE_ROOTS_KEY, root.getPath());
addKotlinSourceRoot(configuration, root.getPath());
}
extraConfiguration(configuration);