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

EA-110813: Resolve the parent directory safely

Browse Source
This commit is contained in:
Yan Zhulanow
2017-11-24 18:02:53 +09:00
committed by Yan Zhulanow
parent e5a2be4f3c
commit c6f922fb64
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt
+8 -1
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.openapi.util.SimpleModificationTracker
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.VirtualFileManager
import com.intellij.psi.PsiDirectory
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.impl.PsiTreeChangeEventImpl
@@ -82,7 +83,7 @@ class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, SimpleModifi
val projectFileIndex = ProjectRootManager.getInstance(xmlFile.project).fileIndex
val module = projectFileIndex.getModuleForFile(xmlFile.virtualFile)
?: element.parent?.let { projectFileIndex.getModuleForFile(it.virtualFile) }
?: element.getContainingDirectorySafe()?.let { projectFileIndex.getModuleForFile(it.virtualFile) }
if (module != null && !module.isDisposed) {
val resourceManager = AndroidLayoutXmlFileManager.getInstance(module) ?: return false
@@ -97,6 +98,12 @@ class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, SimpleModifi
return false
}
private fun PsiFile.getContainingDirectorySafe(): PsiDirectory? {
val virtualFile = this.viewProvider.virtualFile.takeIf { it.isValid } ?: return null
val parentDirectory = virtualFile.parent.takeIf { it.isValid } ?: return null
return this.manager.findDirectory(parentDirectory)
}
private fun findXmlAttribute(element: PsiElement?): XmlAttribute? {
return when (element) {
is XmlToken, is XmlAttributeValue -> findXmlAttribute(element.parent)