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

Move vFile.isValid() check inside read action

Browse Source 
Fixes KT-38541
This commit is contained in:
Matthew Gharrity
2020-04-23 19:29:39 -04:00
parent 403cdedf2e
commit e0ca94279a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/listener/ScriptChangeListener.kt
+2 -3
View File
@@ -27,10 +27,9 @@ abstract class ScriptChangeListener(protected val project: Project) {
abstract fun isApplicable(vFile: VirtualFile): Boolean abstract fun isApplicable(vFile: VirtualFile): Boolean
protected fun getAnalyzableKtFileForScript(vFile: VirtualFile): KtFile? { protected fun getAnalyzableKtFileForScript(vFile: VirtualFile): KtFile? {
if (project.isDisposed) return null
if (!vFile.isValid) return null
return runReadAction { return runReadAction {
if (project.isDisposed) return@runReadAction null
if (!vFile.isValid) return@runReadAction null
(PsiManager.getInstance(project).findFile(vFile) as? KtFile)?.takeIf { (PsiManager.getInstance(project).findFile(vFile) as? KtFile)?.takeIf {
ProjectRootsUtil.isInProjectSource(it, includeScriptsOutsideSourceRoots = true) ProjectRootsUtil.isInProjectSource(it, includeScriptsOutsideSourceRoots = true)
} }