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

use CharSequence methods where available (KOTLIN-CR-2456)

Browse Source
This commit is contained in:
Egor Ushakov
2018-11-09 19:52:45 +03:00
parent 35cc6ff495
commit 06d91fd95f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt
+1 -1
View File
@@ -66,7 +66,7 @@ class KotlinPackageContentModificationListener(private val project: Project) {
.filter(::isRelevant) .filter(::isRelevant)
.filter { .filter {
val vFile = it.file!! val vFile = it.file!!
vFile.isDirectory || FileTypeRegistry.getInstance().getFileTypeByFileName(vFile.name) == KotlinFileType.INSTANCE vFile.isDirectory || FileTypeRegistry.getInstance().getFileTypeByFileName(vFile.nameSequence) == KotlinFileType.INSTANCE
} }
.forEach { event -> service.notifyPackageChange(event) } .forEach { event -> service.notifyPackageChange(event) }
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt
+1 -1
View File
@@ -121,7 +121,7 @@ object ProjectRootsUtil {
if (!includeLibraryClasses && !includeLibrarySource) return false if (!includeLibraryClasses && !includeLibrarySource) return false
// NOTE: the following is a workaround for cases when class files are under library source roots and source files are under class roots // NOTE: the following is a workaround for cases when class files are under library source roots and source files are under class roots
val fileType = FileTypeManager.getInstance().getFileTypeByFileName(file.name) val fileType = FileTypeManager.getInstance().getFileTypeByFileName(file.nameSequence)
val canContainClassFiles = fileType == ArchiveFileType.INSTANCE || file.isDirectory val canContainClassFiles = fileType == ArchiveFileType.INSTANCE || file.isDirectory
val isBinary = fileType.isKotlinBinary() val isBinary = fileType.isKotlinBinary()