Merge pull request #3331 from gharrma/fix-script-change-listener

Move vFile.isValid() check inside read action
2020-04-27 17:59:13 +03:00
parent 442331acc9 e0ca94279a
commit 8e93ac0df7
1 changed files with 2 additions and 3 deletions
@@ -27,10 +27,9 @@ abstract class ScriptChangeListener(protected val project: Project) {
    abstract fun isApplicable(vFile: VirtualFile): Boolean

    protected fun getAnalyzableKtFileForScript(vFile: VirtualFile): KtFile? {
-        if (project.isDisposed) return null
-        if (!vFile.isValid) return null
-
        return runReadAction {
+            if (project.isDisposed) return@runReadAction null
+            if (!vFile.isValid) return@runReadAction null
            (PsiManager.getInstance(project).findFile(vFile) as? KtFile)?.takeIf {
                ProjectRootsUtil.isInProjectSource(it, includeScriptsOutsideSourceRoots = true)
            }