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

Android Extensions: Fix "Inconsistent file tree" exception on Activity creation (KT-22349)

Browse Source
This commit is contained in:
Yan Zhulanow
2018-01-19 14:22:04 +03:00
parent 7b055c2172
commit e12deb54d6
1 changed files with 1 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
+1 -1
View File
@@ -100,7 +100,7 @@ class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, SimpleModifi
private fun PsiFile.getContainingDirectorySafe(): PsiDirectory? { private fun PsiFile.getContainingDirectorySafe(): PsiDirectory? {
val virtualFile = this.viewProvider.virtualFile.takeIf { it.isValid } ?: return null val virtualFile = this.viewProvider.virtualFile.takeIf { it.isValid } ?: return null
val parentDirectory = virtualFile.parent.takeIf { it.isValid } ?: return null val parentDirectory = virtualFile.parent?.takeIf { it.isValid } ?: return null
return this.manager.findDirectory(parentDirectory) return this.manager.findDirectory(parentDirectory)
} }