Fixed import of JS source sets with Both mode

Added flag indicating that source set naming contract is violated. In this case disambiguition classifier is ignored in IDE. #KT-37562 Fixed
2020-04-28 22:13:51 +03:00
parent 1f40a71cbe
commit 96887d6e9f
5 changed files with 17 additions and 1 deletions
@@ -354,7 +354,12 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService {
        val getDisambiguationClassifier = targetClass.getMethodOrNull("getDisambiguationClassifier") ?: return null
        val platformId = (getPlatformType.invoke(gradleTarget) as? Named)?.name ?: return null
        val platform = KotlinPlatform.byId(platformId) ?: return null
-        val disambiguationClassifier = getDisambiguationClassifier(gradleTarget) as? String
+        val useDisambiguationClassifier =
+            targetClass.getMethodOrNull("getUseDisambiguitionClassifierAsSourcesetNamePreffix")?.invoke(gradleTarget) as? Boolean ?: true
+        val disambiguationClassifier = if (useDisambiguationClassifier)
+            getDisambiguationClassifier(gradleTarget) as? String
+        else
+            null
        val getPreset = targetClass.getMethodOrNull("getPreset")
        val targetPresetName: String?
        targetPresetName = try {