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

Scripts: rehighlighting should be called for opened scripts after changing script definitions

Browse Source 
In case when script dependencies were absent for script, highlighting was called only when the script changed
This commit is contained in:
Natalia Selezneva
2019-09-18 15:43:32 +03:00
parent 3ac099fc9a
commit 5872a47c0e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt
+3 -1
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.idea.core.util.EDT
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition
import org.jetbrains.kotlin.scripting.definitions.isNonScript
import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResult import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResult
import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper
import org.jetbrains.kotlin.scripting.resolve.ScriptReportSink import org.jetbrains.kotlin.scripting.resolve.ScriptReportSink
@@ -320,7 +321,8 @@ class ScriptConfigurationManagerImpl internal constructor(private val project: P
} }
private fun clearAndRehighlight() { private fun clearAndRehighlight() {
updateHighlighting(memoryCache.clearConfigurationCaches()) val openedScripts = FileEditorManager.getInstance(project).openFiles.filterNot { it.isNonScript() }
updateHighlighting(openedScripts)
} }
private fun scriptDependenciesClassFilesScope(file: VirtualFile): GlobalSearchScope { private fun scriptDependenciesClassFilesScope(file: VirtualFile): GlobalSearchScope {