Configuration: Do not show -Xfriend-paths in additional arguments

#KT-25945 Fixed

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt

@@ -2228,6 +2228,60 @@ compileTestKotlin {
         assertAllModulesConfigured()
     }
 
+    @Test
+    fun testNoFriendPathsAreShown() {
+        createProjectSubFile(
+            "build.gradle", """
+            buildscript {
+                repositories {
+                    mavenCentral()
+                    maven {
+                        url 'http://dl.bintray.com/kotlin/kotlin-dev'
+                    }
+                }
+
+                dependencies {
+                    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.70-eap-4")
+                }
+            }
+
+            apply plugin: 'kotlin'
+
+            repositories {
+                mavenCentral()
+                maven {
+                    url 'http://dl.bintray.com/kotlin/kotlin-dev'
+                }
+            }
+
+            dependencies {
+                compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.70-eap-4"
+            }
+        """
+        )
+        importProject()
+
+        Assert.assertEquals(
+            "-Xdump-declarations-to=tmpTest",
+            testFacetSettings.compilerSettings!!.additionalArguments
+        )
+
+        assertAllModulesConfigured()
+
+        Assert.assertEquals(
+            listOf("file:///src/main/java" to JavaSourceRootType.SOURCE,
+                   "file:///src/main/kotlin" to JavaSourceRootType.SOURCE,
+                   "file:///src/main/resources" to JavaResourceRootType.RESOURCE),
+            getSourceRootInfos("project_main")
+        )
+        Assert.assertEquals(
+            listOf("file:///src/test/java" to JavaSourceRootType.TEST_SOURCE,
+                   "file:///src/test/kotlin" to JavaSourceRootType.TEST_SOURCE,
+                   "file:///src/test/resources" to JavaResourceRootType.TEST_RESOURCE),
+            getSourceRootInfos("project_test")
+        )
+    }
+
     private fun checkStableModuleName(projectName: String, expectedName: String, platform: TargetPlatform, isProduction: Boolean) {
         val module = getModule(projectName)
         val moduleInfo = if (isProduction) module.productionSourceInfo() else module.testSourceInfo()

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as31

@@ -1977,6 +1977,60 @@ compileTestKotlin {
         assertAllModulesConfigured()
     }
 
+    @Test
+    fun testNoFriendPathsAreShown() {
+        createProjectSubFile(
+            "build.gradle", """
+            buildscript {
+                repositories {
+                    mavenCentral()
+                    maven {
+                        url 'http://dl.bintray.com/kotlin/kotlin-dev'
+                    }
+                }
+
+                dependencies {
+                    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.70-eap-4")
+                }
+            }
+
+            apply plugin: 'kotlin'
+
+            repositories {
+                mavenCentral()
+                maven {
+                    url 'http://dl.bintray.com/kotlin/kotlin-dev'
+                }
+            }
+
+            dependencies {
+                compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.70-eap-4"
+            }
+        """
+        )
+        importProject()
+
+        Assert.assertEquals(
+            "-Xdump-declarations-to=tmpTest",
+            testFacetSettings.compilerSettings!!.additionalArguments
+        )
+
+        assertAllModulesConfigured()
+
+        Assert.assertEquals(
+            listOf("file:///src/main/java" to JavaSourceRootType.SOURCE,
+                   "file:///src/main/kotlin" to JavaSourceRootType.SOURCE,
+                   "file:///src/main/resources" to JavaResourceRootType.RESOURCE),
+            getSourceRootInfos("project_main")
+        )
+        Assert.assertEquals(
+            listOf("file:///src/test/java" to JavaSourceRootType.TEST_SOURCE,
+                   "file:///src/test/kotlin" to JavaSourceRootType.TEST_SOURCE,
+                   "file:///src/test/resources" to JavaResourceRootType.TEST_RESOURCE),
+            getSourceRootInfos("project_test")
+        )
+    }
+
     private fun checkStableModuleName(projectName: String, expectedName: String, platform: TargetPlatform, isProduction: Boolean) {
         val module = getModule(projectName)
         val moduleInfo = if (isProduction) module.productionSourceInfo() else module.testSourceInfo()

idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt.as32

@@ -1977,6 +1977,60 @@ compileTestKotlin {
         assertAllModulesConfigured()
     }
 
+    @Test
+    fun testNoFriendPathsAreShown() {
+        createProjectSubFile(
+            "build.gradle", """
+            buildscript {
+                repositories {
+                    mavenCentral()
+                    maven {
+                        url 'http://dl.bintray.com/kotlin/kotlin-dev'
+                    }
+                }
+
+                dependencies {
+                    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.70-eap-4")
+                }
+            }
+
+            apply plugin: 'kotlin'
+
+            repositories {
+                mavenCentral()
+                maven {
+                    url 'http://dl.bintray.com/kotlin/kotlin-dev'
+                }
+            }
+
+            dependencies {
+                compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.70-eap-4"
+            }
+        """
+        )
+        importProject()
+
+        Assert.assertEquals(
+            "-Xdump-declarations-to=tmpTest",
+            testFacetSettings.compilerSettings!!.additionalArguments
+        )
+
+        assertAllModulesConfigured()
+
+        Assert.assertEquals(
+            listOf("file:///src/main/java" to JavaSourceRootType.SOURCE,
+                   "file:///src/main/kotlin" to JavaSourceRootType.SOURCE,
+                   "file:///src/main/resources" to JavaResourceRootType.RESOURCE),
+            getSourceRootInfos("project_main")
+        )
+        Assert.assertEquals(
+            listOf("file:///src/test/java" to JavaSourceRootType.TEST_SOURCE,
+                   "file:///src/test/kotlin" to JavaSourceRootType.TEST_SOURCE,
+                   "file:///src/test/resources" to JavaResourceRootType.TEST_RESOURCE),
+            getSourceRootInfos("project_test")
+        )
+    }
+
     private fun checkStableModuleName(projectName: String, expectedName: String, platform: TargetPlatform, isProduction: Boolean) {
         val module = getModule(projectName)
         val moduleInfo = if (isProduction) module.productionSourceInfo() else module.testSourceInfo()

idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt

@@ -198,8 +198,11 @@ private val jvmSpecificUIExposedFields = listOf(
     K2JVMCompilerArguments::destination.name,
     K2JVMCompilerArguments::classpath.name
 )
+private val jvmSpecificUIHiddenFields = listOf(
+    K2JVMCompilerArguments::friendPaths.name
+)
 val jvmUIExposedFields = commonUIExposedFields + jvmSpecificUIExposedFields
-private val jvmPrimaryFields = commonPrimaryFields + jvmSpecificUIExposedFields
+private val jvmPrimaryFields = commonPrimaryFields + jvmSpecificUIExposedFields + jvmSpecificUIHiddenFields
 
 private val jsSpecificUIExposedFields = listOf(
     K2JSCompilerArguments::sourceMap.name,