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

Fix a typo

Browse Source
This commit is contained in:
Yan Zhulanow
2014-10-30 16:41:22 +03:00
parent abd4e98a99
commit 27e1e7ffdb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/src/org/jetbrains/jet/lang/resolve/android/AndroidResourceManagerBase.kt
+2 -2
View File
@@ -29,11 +29,11 @@ abstract class AndroidResourceManagerBase(project: Project, searchPath: String?)
val fileManager = VirtualFileManager.getInstance() val fileManager = VirtualFileManager.getInstance()
val watchDir = fileManager.findFileByUrl("file://" + searchPath) val watchDir = fileManager.findFileByUrl("file://" + searchPath)
val psiManager = PsiManager.getInstance(project) val psiManager = PsiManager.getInstance(project)
val files = watchDir?.getChildren()?.toArrayList()?.map { psiManager.findFile(it) }?.mapNotNull { it } ?: ArrayList(0) val files = watchDir?.getChildren()?.toArrayList()?.map { psiManager.findFile(it) }?.mapNotNull { it } ?: listOf()
return files.sortBy({it.getName()}) return files.sortBy({it.getName()})
} }
protected fun vritualFileToPsi(vf: VirtualFile): PsiFile? { protected fun virtualFileToPsi(vf: VirtualFile): PsiFile? {
val psiManager = PsiManager.getInstance(project) val psiManager = PsiManager.getInstance(project)
return psiManager.findFile(vf) return psiManager.findFile(vf)
plugins/android-idea-plugin/src/org/jetbrains/jet/plugin/android/IDEAndroidResourceManager.kt
+1 -1
View File
@@ -35,7 +35,7 @@ public class IDEAndroidResourceManager(project: Project, searchPath: String?) :
override fun getLayoutXmlFiles(): Collection<PsiFile> { override fun getLayoutXmlFiles(): Collection<PsiFile> {
try { try {
val directories = getAndroidFacet().getAllResourceDirectories() val directories = getAndroidFacet().getAllResourceDirectories()
return directories.flatMap { (it.findChild("layout")?.getChildren() ?: array<VirtualFile>()).map { vritualFileToPsi(it)!! } } return directories.flatMap { (it.findChild("layout")?.getChildren() ?: array<VirtualFile>()).map { virtualFileToPsi(it)!! } }
} catch (e: NoAndroidFacetException) { } catch (e: NoAndroidFacetException) {
return listOf() return listOf()
} }