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

reuse Gradle external system ID

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-03-01 17:21:31 +01:00
parent 13f4053950
commit 828e53ce82
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java
+2 -2
View File
@@ -18,11 +18,11 @@ package org.jetbrains.kotlin.idea;
import com.intellij.facet.Facet; import com.intellij.facet.Facet;
import com.intellij.facet.FacetManager; import com.intellij.facet.FacetManager;
import com.intellij.openapi.externalSystem.model.ProjectSystemId;
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil; import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
import com.intellij.openapi.module.Module; import com.intellij.openapi.module.Module;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.configuration.KotlinModuleTypeManager; import org.jetbrains.kotlin.idea.configuration.KotlinModuleTypeManager;
import org.jetbrains.kotlin.idea.framework.KotlinLibraryUtilKt;
public class KotlinModuleTypeManagerImpl extends KotlinModuleTypeManager { public class KotlinModuleTypeManagerImpl extends KotlinModuleTypeManager {
@Override @Override
@@ -41,6 +41,6 @@ public class KotlinModuleTypeManagerImpl extends KotlinModuleTypeManager {
@Override @Override
public boolean isGradleModule(@NotNull Module module) { public boolean isGradleModule(@NotNull Module module) {
return ExternalSystemApiUtil.isExternalSystemAwareModule(new ProjectSystemId("GRADLE"), module); return ExternalSystemApiUtil.isExternalSystemAwareModule(KotlinLibraryUtilKt.getGRADLE_SYSTEM_ID(), module);
} }
} }
idea/src/org/jetbrains/kotlin/idea/framework/KotlinLibraryUtil.kt
+2 -1
View File
@@ -37,7 +37,8 @@ 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") val GRADLE_SYSTEM_ID = ProjectSystemId("GRADLE")
private fun isExternalLibrary(library: Library): Boolean { private 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) ||