From 78844dd4aac8847e104a160d5dfc042df2e66f08 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 3 Apr 2017 17:45:16 +0200
Subject: [PATCH] Use new path for stdlib sources jar

---
 compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java | 2 +-
 .../org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java    | 4 ++--
 compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java    | 2 +-
 .../kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt          | 2 +-
 .../kotlin/idea/versions/KotlinUpdatePluginComponent.kt       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java
index efa649d69e3..796cb1ecc51 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java
@@ -46,7 +46,7 @@ public interface KotlinPaths {
     File getKotlinTestPath();
 
     @NotNull
-    File getRuntimeSourcesPath();
+    File getStdlibSourcesPath();
 
     @NotNull
     File getJsStdLibJarPath();
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java
index 2ace411e392..4265a5d3c5f 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java
@@ -72,8 +72,8 @@ public class KotlinPathsFromHomeDir implements KotlinPaths {
 
     @NotNull
     @Override
-    public File getRuntimeSourcesPath() {
-        return getLibraryFile(PathUtil.KOTLIN_JAVA_RUNTIME_SRC_JAR);
+    public File getStdlibSourcesPath() {
+        return getLibraryFile(PathUtil.KOTLIN_JAVA_STDLIB_SRC_JAR);
     }
 
     @Override
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java
index 90538b9f85e..7d3e945adca 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java
@@ -40,7 +40,7 @@ public class PathUtil {
     public static final String KOTLIN_JAVA_SCRIPT_RUNTIME_JAR = "kotlin-script-runtime.jar";
     public static final String KOTLIN_TEST_JAR = "kotlin-test.jar";
     public static final String KOTLIN_TEST_JS_JAR = "kotlin-test-js.jar";
-    public static final String KOTLIN_JAVA_RUNTIME_SRC_JAR = "kotlin-runtime-sources.jar";
+    public static final String KOTLIN_JAVA_STDLIB_SRC_JAR = "kotlin-stdlib-sources.jar";
     public static final String KOTLIN_COMPILER_JAR = "kotlin-compiler.jar";
 
     public static final Pattern KOTLIN_RUNTIME_JAR_PATTERN = Pattern.compile("kotlin-(stdlib|runtime)(-\\d[\\d.]+(-.+)?)?\\.jar");
diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
index 4a6e404de41..5d232b7fa14 100644
--- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
@@ -176,7 +176,7 @@ enum class LibraryJarDescriptor(val jarName: String,
     REFLECT_JAR(PathUtil.KOTLIN_JAVA_REFLECT_JAR, OrderRootType.CLASSES, false, KotlinPaths::getReflectPath),
     SCRIPT_RUNTIME_JAR(PathUtil.KOTLIN_JAVA_SCRIPT_RUNTIME_JAR, OrderRootType.CLASSES, true, KotlinPaths::getScriptRuntimePath),
     TEST_JAR(PathUtil.KOTLIN_TEST_JAR, OrderRootType.CLASSES, false, KotlinPaths::getKotlinTestPath),
-    RUNTIME_SRC_JAR(PathUtil.KOTLIN_JAVA_RUNTIME_SRC_JAR, OrderRootType.SOURCES, false, KotlinPaths::getRuntimeSourcesPath),
+    RUNTIME_SRC_JAR(PathUtil.KOTLIN_JAVA_STDLIB_SRC_JAR, OrderRootType.SOURCES, false, KotlinPaths::getStdlibSourcesPath),
     JS_STDLIB_JAR(PathUtil.JS_LIB_JAR_NAME, OrderRootType.CLASSES, true, KotlinPaths::getJsStdLibJarPath),
     JS_STDLIB_SRC_JAR(PathUtil.JS_LIB_SRC_JAR_NAME, OrderRootType.SOURCES, false, KotlinPaths::getJsStdLibSrcJarPath);
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt
index b1521793f31..9281c001cb1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt
@@ -51,7 +51,7 @@ class KotlinUpdatePluginComponent : ApplicationComponent {
             requestFullJarUpdate(ideaPluginPaths.stdlibPath)
             requestFullJarUpdate(ideaPluginPaths.reflectPath)
             requestFullJarUpdate(ideaPluginPaths.scriptRuntimePath)
-            requestFullJarUpdate(ideaPluginPaths.runtimeSourcesPath)
+            requestFullJarUpdate(ideaPluginPaths.stdlibSourcesPath)
 
             requestFullJarUpdate(ideaPluginPaths.jsStdLibJarPath)
             requestFullJarUpdate(ideaPluginPaths.jsStdLibSrcJarPath)