From 715f4ad0db9a718d20ce839b4bbdaaf7fa85a588 Mon Sep 17 00:00:00 2001 From: Maxim Manuylov Date: Sun, 22 Jul 2012 21:31:38 +0400 Subject: [PATCH] improve error texts --- .../plugin/OutdatedKotlinRuntimeNotification.java | 4 ++-- .../jet/plugin/compiler/CompilerEnvironment.java | 15 +++++++-------- ...onfigureKotlinLibraryNotificationProvider.java | 2 +- .../jet/plugin/quickfix/JsModuleSetUp.java | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/OutdatedKotlinRuntimeNotification.java b/idea/src/org/jetbrains/jet/plugin/OutdatedKotlinRuntimeNotification.java index 4d609fdabc7..c65ba350dd1 100644 --- a/idea/src/org/jetbrains/jet/plugin/OutdatedKotlinRuntimeNotification.java +++ b/idea/src/org/jetbrains/jet/plugin/OutdatedKotlinRuntimeNotification.java @@ -66,7 +66,7 @@ public class OutdatedKotlinRuntimeNotification implements ModuleComponent { String runtimeVersion = getRuntimeVersion(getKotlinRuntimeJar()); if (runtimeVersion == null) return; // runtime is not present in project final String sdkVersion = getRuntimeVersion(getRuntimeFromSdk()); - if (sdkVersion == null || "snapshot".equals(sdkVersion)) return; // plugin is run from sources, can't compare versions + if (sdkVersion == null || "snapshot".equals(sdkVersion)) return; // plugin is run from sources or SDK is not configured for the module, can't compare versions // user already clicked suppress if (sdkVersion.equals(PropertiesComponent.getInstance(myModule.getProject()).getValue(mySuppressedPropertyName))) return; @@ -110,7 +110,7 @@ public class OutdatedKotlinRuntimeNotification implements ModuleComponent { File runtimePath = PluginPathUtil.getRuntimePath(myModule); if (runtimePath == null) { Messages.showErrorDialog(myModule.getProject(), - "kotlin-runtime.jar is not found. Make sure plugin is properly installed.", + "\"kotlin-runtime.jar\" is not found. Make sure Kotlin SDK is configured for module \"" + myModule.getName() + "\".", "No Runtime Found"); return; } diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/CompilerEnvironment.java b/idea/src/org/jetbrains/jet/plugin/compiler/CompilerEnvironment.java index da6361c25a5..0e8a7b6e6b7 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/CompilerEnvironment.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/CompilerEnvironment.java @@ -37,15 +37,15 @@ public final class CompilerEnvironment { VirtualFile mainOutput = compileContext.getModuleOutputDirectory(module); final VirtualFile outputDir = tests ? compileContext.getModuleOutputDirectoryForTests(module) : mainOutput; File kotlinHome = KotlinSdkUtil.getSDKHomeFor(module); - return new CompilerEnvironment(kotlinHome, outputDir); + return new CompilerEnvironment(module.getName(), kotlinHome, outputDir); } - @Nullable - private final File kotlinHome; - @Nullable - private final VirtualFile output; + @NotNull private final String moduleName; + @Nullable private final File kotlinHome; + @Nullable private final VirtualFile output; - public CompilerEnvironment(@Nullable File home, @Nullable VirtualFile output) { + public CompilerEnvironment(@NotNull String moduleName, @Nullable File home, @Nullable VirtualFile output) { + this.moduleName = moduleName; this.kotlinHome = home; this.output = output; } @@ -71,8 +71,7 @@ public final class CompilerEnvironment { compileContext.addMessage(ERROR, "[Internal Error] No output directory", "", -1, -1); } if (kotlinHome == null) { - compileContext.addMessage(ERROR, "Cannot find kotlinc home. Make sure plugin is properly installed", "", -1, -1); + compileContext.addMessage(ERROR, "Cannot find Kotlin SDK home. Make sure Kotlin SDK is configured for module \"" + moduleName + "\".", "", -1, -1); } } - } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java index 046775df8a5..71bb193f35a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ConfigureKotlinLibraryNotificationProvider.java @@ -118,7 +118,7 @@ public class ConfigureKotlinLibraryNotificationProvider implements EditorNotific File runtimePath = PluginPathUtil.getRuntimePath(module); if (runtimePath == null) { - Messages.showErrorDialog(myProject, "kotlin-runtime.jar is not found. Make sure plugin is properly installed.", + Messages.showErrorDialog(myProject, "\"kotlin-runtime.jar\" is not found. Make sure Kotlin SDK is configured for module \"" + module.getName() + "\".", "No Runtime Found"); return null; } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java b/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java index 12928057a8d..2fc62eb1686 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java @@ -113,7 +113,7 @@ public final class JsModuleSetUp { File jsLibJarPath = PluginPathUtil.getJsLibJarPath(module); File jsLibJsPath = PluginPathUtil.getJsLibJsPath(module); if ((jsLibJarPath == null) || (jsLibJsPath == null)) { - notifyFailure("JavaScript library not found. Make sure plugin is installed properly."); + notifyFailure("JavaScript library not found. Make sure Kotlin SDK is configured for module \"" + module.getName() + "\"."); return false; }