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

Rename ScriptDependenciesManager to ScriptConfigurationManager

Browse Source
This commit is contained in:
Natalia Selezneva
2019-08-22 12:43:59 +03:00
parent fa6b5b567b
commit fb01f7be5e
27 changed files with 68 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt
+4 -4
View File
@@ -65,8 +65,8 @@ import com.intellij.util.io.exists
import com.intellij.xml.XmlSchemaProvider
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.configuration.getModulesWithKotlinFiles
import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager
import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings
import org.jetbrains.kotlin.idea.core.util.toPsiFile
import org.jetbrains.kotlin.idea.framework.KotlinSdkType
@@ -327,7 +327,7 @@ abstract class AbstractPerformanceProjectsTest : UsefulTestCase() {
val initialText = editor.document.text
try {
if (isAKotlinScriptFile(fileName)) {
ScriptDependenciesManager.updateScriptDependenciesSynchronously(virtualFile, project)
ScriptConfigurationManager.updateScriptDependenciesSynchronously(fileInEditor.psiFile, project)
}
val tasksIdx = fileInEditor.document.text.indexOf(marker)
@@ -402,7 +402,7 @@ abstract class AbstractPerformanceProjectsTest : UsefulTestCase() {
val initialText = editor.document.text
if (isAKotlinScriptFile(fileName)) {
runAndMeasure("update script dependencies for $fileName") {
ScriptDependenciesManager.updateScriptDependenciesSynchronously(virtualFile, project)
ScriptConfigurationManager.updateScriptDependenciesSynchronously(file, project)
}
}
@@ -588,7 +588,7 @@ abstract class AbstractPerformanceProjectsTest : UsefulTestCase() {
testName = "updateScriptDependencies ${notePrefix(note)}${simpleFilename(fileName)}",
setUp = { it.setUpValue = openFileInEditor(project, fileName) },
test = {
ScriptDependenciesManager.updateScriptDependenciesSynchronously(it.setUpValue!!.psiFile.virtualFile, project)
ScriptConfigurationManager.updateScriptDependenciesSynchronously(it.setUpValue!!.psiFile, project)
it.value = it.setUpValue
},
tearDown = {
idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceProjectsTest.kt
+2 -2
View File
@@ -12,7 +12,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Disposer
import com.intellij.psi.PsiElement
import com.intellij.testFramework.propertyBased.MadTestingUtil
import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager
import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
import org.jetbrains.kotlin.idea.highlighter.KotlinPsiChecker
import org.jetbrains.kotlin.idea.highlighter.KotlinPsiCheckerAndHighlightingUpdater
import org.jetbrains.kotlin.idea.testFramework.Fixture
@@ -260,7 +260,7 @@ class PerformanceProjectsTest : AbstractPerformanceProjectsTest() {
// Note: Kotlin scripts require dependencies to be loaded
if (isAKotlinScriptFile(fileName)) {
ScriptDependenciesManager.updateScriptDependenciesSynchronously(fileInEditor.psiFile.virtualFile, project)
ScriptConfigurationManager.updateScriptDependenciesSynchronously(fileInEditor.psiFile, project)
}
resetTimestamp()