From d2b948dc2ca11ab3a29abf1b5d9779a58a7756fb Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 4 Dec 2013 23:35:51 -0800 Subject: [PATCH] Fix path util to return dist paths in tests --- compiler/util/src/org/jetbrains/jet/utils/PathUtil.java | 5 ++++- .../jet/plugin/compiler/TranslatingCompilerUtils.java | 5 +---- .../configuration/KotlinJavaModuleConfigurator.java | 4 ++-- .../plugin/configuration/KotlinJsModuleConfigurator.java | 4 ++-- .../configuration/KotlinWithLibraryConfigurator.java | 8 -------- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/compiler/util/src/org/jetbrains/jet/utils/PathUtil.java b/compiler/util/src/org/jetbrains/jet/utils/PathUtil.java index bc1b5d73ce0..fef9cda073e 100644 --- a/compiler/util/src/org/jetbrains/jet/utils/PathUtil.java +++ b/compiler/util/src/org/jetbrains/jet/utils/PathUtil.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.utils; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathManager; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; @@ -43,7 +44,9 @@ public class PathUtil { @NotNull public static KotlinPaths getKotlinPathsForIdeaPlugin() { - return new KotlinPathsFromHomeDir(getCompilerPathForIdeaPlugin()); + return ApplicationManager.getApplication().isUnitTestMode() + ? getKotlinPathsForDistDirectory() + : new KotlinPathsFromHomeDir(getCompilerPathForIdeaPlugin()); } @NotNull diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/TranslatingCompilerUtils.java b/idea/src/org/jetbrains/jet/plugin/compiler/TranslatingCompilerUtils.java index e939870d5ec..a29b55f389e 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/TranslatingCompilerUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/TranslatingCompilerUtils.java @@ -19,7 +19,6 @@ package org.jetbrains.jet.plugin.compiler; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.intellij.compiler.impl.javaCompiler.OutputItemImpl; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.compiler.CompileContext; import com.intellij.openapi.compiler.TranslatingCompiler; import com.intellij.openapi.module.Module; @@ -46,9 +45,7 @@ public final class TranslatingCompilerUtils { VirtualFile mainOutput = compileContext.getModuleOutputDirectory(module); VirtualFile outputDirectoryForTests = compileContext.getModuleOutputDirectoryForTests(module); File outputDir = tests ? toNullableIoFile(outputDirectoryForTests) : toNullableIoFile(mainOutput); - KotlinPaths kotlinPaths = ApplicationManager.getApplication().isUnitTestMode() - ? PathUtil.getKotlinPathsForDistDirectory() - : PathUtil.getKotlinPathsForIdeaPlugin(); + KotlinPaths kotlinPaths = PathUtil.getKotlinPathsForIdeaPlugin(); return CompilerEnvironment.getEnvironmentFor(kotlinPaths, outputDir); } diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java index 6126d05fb84..e6ec1cadafb 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java @@ -106,12 +106,12 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator @Override @NotNull public File getExistedJarFile() { - return assertFileExists(getKotlinPaths().getRuntimePath()); + return assertFileExists(PathUtil.getKotlinPathsForIdeaPlugin().getRuntimePath()); } @Override public File getExistedSourcesJarFile() { - return assertFileExists(getKotlinPaths().getRuntimeSourcesPath()); + return assertFileExists(PathUtil.getKotlinPathsForIdeaPlugin().getRuntimeSourcesPath()); } public void copySourcesToPathFromLibrary(@NotNull Library library) { diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java index 702d1076322..af404adf8b1 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java @@ -81,7 +81,7 @@ public class KotlinJsModuleConfigurator extends KotlinWithLibraryConfigurator { @NotNull @Override public File getExistedJarFile() { - return assertFileExists(getKotlinPaths().getJsLibJarPath()); + return assertFileExists(PathUtil.getKotlinPathsForIdeaPlugin().getJsLibJarPath()); } @Override @@ -125,7 +125,7 @@ public class KotlinJsModuleConfigurator extends KotlinWithLibraryConfigurator { @NotNull public File getJsFile() { - return assertFileExists(getKotlinPaths().getJsLibJsPath()); + return assertFileExists(PathUtil.getKotlinPathsForIdeaPlugin().getJsLibJsPath()); } private static boolean needToChooseJsFilePath(@NotNull Project project) { diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithLibraryConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithLibraryConfigurator.java index ea7aaaa5ceb..020905e889e 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithLibraryConfigurator.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithLibraryConfigurator.java @@ -19,8 +19,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.JetPluginUtil; import org.jetbrains.jet.plugin.framework.ui.FileUIUtils; -import org.jetbrains.jet.utils.KotlinPaths; -import org.jetbrains.jet.utils.PathUtil; import java.io.File; @@ -417,12 +415,6 @@ public abstract class KotlinWithLibraryConfigurator implements KotlinProjectConf } } - protected static KotlinPaths getKotlinPaths() { - return ApplicationManager.getApplication().isUnitTestMode() - ? PathUtil.getKotlinPathsForDistDirectory() - : PathUtil.getKotlinPathsForIdeaPlugin(); - } - @NotNull private String getPathToCopyFileTo( @NotNull Project project,