Fix exception from ProjectResolutionFacade when switching some definition off in settings

Fix AbstractScriptDefinitionsOrderTest
Remove updating script dependencies in test because in affects cache behavior: script will be already up to date when highlighting is called for the second time
This commit is contained in:
Natalia Selezneva
2019-09-06 15:58:49 +03:00
parent 3ad7f516be
commit a62863128c
2 changed files with 4 additions and 2 deletions
@@ -100,6 +100,8 @@ class ScriptConfigurationManagerImpl internal constructor(private val project: P
* Start re-highlighting for opened scripts
*/
override fun clearConfigurationCachesAndRehighlight() {
ScriptDependenciesModificationTracker.getInstance(project).incModificationCount()
clearAndRehighlight()
}
@@ -5,13 +5,14 @@
package org.jetbrains.kotlin.idea.script
import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase
import com.intellij.testFramework.exceptionCases.AbstractExceptionCase
import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager
import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.junit.ComparisonFailure
@DaemonAnalyzerTestCase.CanChangeDocumentDuringHighlighting
abstract class AbstractScriptDefinitionsOrderTest : AbstractScriptConfigurationTest() {
fun doTest(path: String) {
configureScriptFile(path)
@@ -41,7 +42,6 @@ abstract class AbstractScriptDefinitionsOrderTest : AbstractScriptConfigurationT
}
ScriptDefinitionsManager.getInstance(project).reorderScriptDefinitions()
ScriptConfigurationManager.updateScriptDependenciesSynchronously(myFile, project)
checkHighlighting(editor, false, false)
}