-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed NPE on StandaloneScriptRootsCache instantiation
Relates to ^EA-218043 #KTIJ-1137 Fixed Original commit: 1d63a1b48d480b958ff44676c42b698a8ca5f64a (cherry picked from commit 98ba379)
- Loading branch information
1 parent
e148cbe
commit 4c61fb4
Showing
4 changed files
with
63 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
.../idea-gradle/tests/org/jetbrains/kotlin/idea/scripting/gradle/GradleBuildRootIndexTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
/* | ||
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. | ||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. | ||
*/ | ||
|
||
package org.jetbrains.kotlin.idea.scripting.gradle | ||
|
||
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil | ||
import com.intellij.psi.PsiFile | ||
import org.jetbrains.kotlin.idea.script.AbstractScriptConfigurationLoadingTest | ||
import org.jetbrains.kotlin.idea.scripting.gradle.roots.GradleBuildRootsManager | ||
import org.jetbrains.kotlin.idea.scripting.gradle.settings.StandaloneScriptsStorage | ||
import org.jetbrains.kotlin.psi.KtFile | ||
import org.jetbrains.plugins.gradle.settings.DistributionType | ||
import org.jetbrains.plugins.gradle.settings.GradleProjectSettings | ||
import org.jetbrains.plugins.gradle.util.GradleConstants | ||
import java.io.File | ||
|
||
class GradleBuildRootIndexTest : AbstractScriptConfigurationLoadingTest() { | ||
override fun setUpTestProject() { | ||
val rootDir = File("idea/testData/script/definition/loading/gradle/") | ||
|
||
val settings: KtFile = copyFromTestdataToProject(File(rootDir, GradleConstants.KOTLIN_DSL_SETTINGS_FILE_NAME).path) | ||
val prop: PsiFile = copyFromTestdataToProject(File(rootDir, "gradle.properties").path) | ||
|
||
val gradleCoreJar = createFileInProject("gradle/lib/gradle-core-1.0.0.jar") | ||
val gradleWrapperProperties = createFileInProject("gradle/wrapper/gradle-wrapper.properties") | ||
|
||
val buildGradleKts = rootDir.walkTopDown().find { it.name == GradleConstants.KOTLIN_DSL_SCRIPT_NAME } | ||
?: error("Couldn't find main script") | ||
configureScriptFile(rootDir.path, buildGradleKts) | ||
val build = (myFile as? KtFile) ?: error("") | ||
|
||
val newProjectSettings = GradleProjectSettings() | ||
newProjectSettings.gradleHome = gradleCoreJar.parentFile.parent | ||
newProjectSettings.distributionType = DistributionType.LOCAL | ||
newProjectSettings.externalProjectPath = settings.virtualFile.parent.path | ||
|
||
StandaloneScriptsStorage.getInstance(project)!!.files.add("standalone.kts") | ||
|
||
ExternalSystemApiUtil.getSettings(project, GradleConstants.SYSTEM_ID).linkProject(newProjectSettings) | ||
} | ||
|
||
fun `test standalone scripts on start`() { | ||
assertNotNull(GradleBuildRootsManager.getInstance(project)) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters