azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: rename file

Browse Source
This commit is contained in:
Nikolay Krasko
2016-03-01 15:38:51 +03:00
parent 59e2449d4e
commit 247185735a
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java
+2 -2
View File
@@ -24,7 +24,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.framework.JavaRuntimeLibraryDescription; import org.jetbrains.kotlin.idea.framework.JavaRuntimeLibraryDescription;
import org.jetbrains.kotlin.idea.framework.LibraryPresentationProviderUtilKt; import org.jetbrains.kotlin.idea.framework.KotlinLibraryUtilKt;
import org.jetbrains.kotlin.idea.project.ProjectStructureUtil; import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryCoreUtil; import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryCoreUtil;
import org.jetbrains.kotlin.resolve.TargetPlatform; import org.jetbrains.kotlin.resolve.TargetPlatform;
@@ -96,7 +96,7 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator
@Nullable @Nullable
@Override @Override
protected String getOldSourceRootUrl(@NotNull Library library) { protected String getOldSourceRootUrl(@NotNull Library library) {
VirtualFile runtimeJarPath = LibraryPresentationProviderUtilKt.getRuntimeJar(library); VirtualFile runtimeJarPath = KotlinLibraryUtilKt.getRuntimeJar(library);
return runtimeJarPath != null ? runtimeJarPath.getUrl() + "src" : null; return runtimeJarPath != null ? runtimeJarPath.getUrl() + "src" : null;
} }
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java
+2 -2
View File
@@ -22,7 +22,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.framework.JSLibraryStdDescription; import org.jetbrains.kotlin.idea.framework.JSLibraryStdDescription;
import org.jetbrains.kotlin.idea.framework.LibraryPresentationProviderUtilKt; import org.jetbrains.kotlin.idea.framework.KotlinLibraryUtilKt;
import org.jetbrains.kotlin.idea.project.ProjectStructureUtil; import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
import org.jetbrains.kotlin.js.JavaScript; import org.jetbrains.kotlin.js.JavaScript;
import org.jetbrains.kotlin.js.resolve.JsPlatform; import org.jetbrains.kotlin.js.resolve.JsPlatform;
@@ -97,7 +97,7 @@ public class KotlinJsModuleConfigurator extends KotlinWithLibraryConfigurator {
@Nullable @Nullable
@Override @Override
protected String getOldSourceRootUrl(@NotNull Library library) { protected String getOldSourceRootUrl(@NotNull Library library) {
VirtualFile jsStdLibJar = LibraryPresentationProviderUtilKt.getJsStdLibJar(library); VirtualFile jsStdLibJar = KotlinLibraryUtilKt.getJsStdLibJar(library);
return jsStdLibJar != null ? jsStdLibJar.getUrl() : null; return jsStdLibJar != null ? jsStdLibJar.getUrl() : null;
} }
} }
idea/src/org/jetbrains/kotlin/idea/framework/LibraryPresentationProviderUtil.kt → idea/src/org/jetbrains/kotlin/idea/framework/KotlinLibraryUtil.kt
+2 -3
View File
@@ -38,8 +38,7 @@ fun <LP : LibraryProperties<out Any>> getLibraryProperties(provider: LibraryPres
private val MAVEN_SYSTEM_ID = ProjectSystemId("MAVEN") private val MAVEN_SYSTEM_ID = ProjectSystemId("MAVEN")
private val GRADLE_SYSTEM_ID = ProjectSystemId("GRADLE") private val GRADLE_SYSTEM_ID = ProjectSystemId("GRADLE")
private fun isExternalLibrary(library: Library): Boolean {
fun isExternalLibrary(library: Library): Boolean {
return ExternalSystemApiUtil.isExternalSystemLibrary(library, ProjectSystemId.IDE) || return ExternalSystemApiUtil.isExternalSystemLibrary(library, ProjectSystemId.IDE) ||
ExternalSystemApiUtil.isExternalSystemLibrary(library, GRADLE_SYSTEM_ID) || ExternalSystemApiUtil.isExternalSystemLibrary(library, GRADLE_SYSTEM_ID) ||
ExternalSystemApiUtil.isExternalSystemLibrary(library, MAVEN_SYSTEM_ID) ExternalSystemApiUtil.isExternalSystemLibrary(library, MAVEN_SYSTEM_ID)
@@ -76,5 +75,5 @@ fun getJsStdLibSrcJar(library: Library): VirtualFile? {
} }
private fun getRuntimeSrcJar(classesRoots: List<VirtualFile>): VirtualFile? { private fun getRuntimeSrcJar(classesRoots: List<VirtualFile>): VirtualFile? {
return LibraryUtils.getJarFile(classesRoots, PathUtil.KOTLIN_JAVA_RUNTIME_SRC_JAR); return LibraryUtils.getJarFile(classesRoots, PathUtil.KOTLIN_JAVA_RUNTIME_SRC_JAR)
} }