From 3442c7385f06cca51009cd8248388cf63254ba86 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 21 Aug 2018 14:05:07 +0200 Subject: [PATCH] Fix compilation in KotlinTestUtils for IDEA 173 --- .../org/jetbrains/kotlin/test/KotlinTestUtils.java.173 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 index 433e6f96696..2843e01aa96 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.173 @@ -41,6 +41,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettings; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.config.ContentRootsKt; +import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot; import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; @@ -609,11 +610,11 @@ public class KotlinTestUtils { } public static void resolveAllKotlinFiles(KotlinCoreEnvironment environment) throws IOException { - List paths = ContentRootsKt.getKotlinSourceRoots(environment.getConfiguration()); - if (paths.isEmpty()) return; + List roots = ContentRootsKt.getKotlinSourceRoots(environment.getConfiguration()); + if (roots.isEmpty()) return; List ktFiles = new ArrayList<>(); - for (String path : paths) { - File file = new File(path); + for (KotlinSourceRoot root : roots) { + File file = new File(root.getPath()); if (file.isFile()) { ktFiles.add(loadJetFile(environment.getProject(), file)); }