From 06d91fd95f971ceb99a5fc7524af62b4b71f0098 Mon Sep 17 00:00:00 2001 From: Egor Ushakov Date: Fri, 9 Nov 2018 19:52:45 +0300 Subject: [PATCH] use CharSequence methods where available (KOTLIN-CR-2456) --- .../kotlin/idea/caches/PerModulePackageCacheService.kt | 2 +- .../src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt index 475758eabfd..6670fd3fd6c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt @@ -66,7 +66,7 @@ class KotlinPackageContentModificationListener(private val project: Project) { .filter(::isRelevant) .filter { 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) } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt index 96375426c5d..6638303e078 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt @@ -121,7 +121,7 @@ object ProjectRootsUtil { 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 - val fileType = FileTypeManager.getInstance().getFileTypeByFileName(file.name) + val fileType = FileTypeManager.getInstance().getFileTypeByFileName(file.nameSequence) val canContainClassFiles = fileType == ArchiveFileType.INSTANCE || file.isDirectory val isBinary = fileType.isKotlinBinary()