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

Use addTestJdk&removeTestJdk methods instead addJdk&removeJdk

Browse Source
This commit is contained in:
Alexander Dudinsky
2021-01-20 09:46:03 +03:00
parent 20843b6894
commit 71e74497b5
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
+6 -2
View File
@@ -250,7 +250,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
@Test @Test
fun testJsImportTransitive() { fun testJsImportTransitive() {
configureByFiles() configureByFiles()
importProject() importProject(false)
with(facetSettings) { with(facetSettings) {
Assert.assertEquals("1.3", languageLevel!!.versionString) Assert.assertEquals("1.3", languageLevel!!.versionString)
@@ -867,10 +867,14 @@ class GradleFacetImportTest : GradleImportingTestCase() {
} }
override fun importProject() { override fun importProject() {
importProject(true)
}
fun importProject(skipIndexing: Boolean = true) {
val isCreateEmptyContentRootDirectories = currentExternalProjectSettings.isCreateEmptyContentRootDirectories val isCreateEmptyContentRootDirectories = currentExternalProjectSettings.isCreateEmptyContentRootDirectories
try { try {
currentExternalProjectSettings.isCreateEmptyContentRootDirectories = true currentExternalProjectSettings.isCreateEmptyContentRootDirectories = true
super.importProject(true) super.importProject(skipIndexing)
} finally { } finally {
currentExternalProjectSettings.isCreateEmptyContentRootDirectories = isCreateEmptyContentRootDirectories currentExternalProjectSettings.isCreateEmptyContentRootDirectories = isCreateEmptyContentRootDirectories
} }
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
+5 -2
View File
@@ -31,6 +31,7 @@ import com.intellij.openapi.fileTypes.FileTypeManager
import com.intellij.openapi.projectRoots.JavaSdk import com.intellij.openapi.projectRoots.JavaSdk
import com.intellij.openapi.projectRoots.ProjectJdkTable import com.intellij.openapi.projectRoots.ProjectJdkTable
import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.projectRoots.impl.ProjectJdkTableImpl
import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.Messages
@@ -140,7 +141,8 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
val jdk = SdkConfigurationUtil.setupSdk(arrayOfNulls(0), jdkHomeDir, JavaSdk.getInstance(), true, null, GRADLE_JDK_NAME) val jdk = SdkConfigurationUtil.setupSdk(arrayOfNulls(0), jdkHomeDir, JavaSdk.getInstance(), true, null, GRADLE_JDK_NAME)
TestCase.assertNotNull("Cannot create JDK for $myJdkHome", jdk) TestCase.assertNotNull("Cannot create JDK for $myJdkHome", jdk)
if (!jdkTable.allJdks.contains(jdk)) { if (!jdkTable.allJdks.contains(jdk)) {
jdkTable.addJdk(jdk!!, testRootDisposable) // jdkTable.addJdk(jdk!!, testRootDisposable)
(jdkTable as ProjectJdkTableImpl).addTestJdk(jdk!!, testRootDisposable)
ProjectRootManager.getInstance(myProject).projectSdk = jdk ProjectRootManager.getInstance(myProject).projectSdk = jdk
} }
FileTypeManager.getInstance().associateExtension(GroovyFileType.GROOVY_FILE_TYPE, "gradle") FileTypeManager.getInstance().associateExtension(GroovyFileType.GROOVY_FILE_TYPE, "gradle")
@@ -176,7 +178,8 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
ThrowableRunnable { ThrowableRunnable {
runWrite { runWrite {
Arrays.stream(ProjectJdkTable.getInstance().allJdks).forEach { jdk: Sdk -> Arrays.stream(ProjectJdkTable.getInstance().allJdks).forEach { jdk: Sdk ->
ProjectJdkTable.getInstance().removeJdk(jdk) (ProjectJdkTable.getInstance() as ProjectJdkTableImpl).removeTestJdk(jdk)
// ProjectJdkTable.getInstance().removeJdk(jdk)
} }
for (sdk in removedSdks) { for (sdk in removedSdks) {
SdkConfigurationUtil.addSdk(sdk) SdkConfigurationUtil.addSdk(sdk)