From daaa99989b52b3bc2c611cdec253d4ed1a7026d2 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Thu, 12 Mar 2015 00:36:31 +0300 Subject: [PATCH] IdeaModuleInfos: add LIBRARY_PREFIX constant --- .../jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt index 14ce9f23ca3..a5599a88ce6 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt @@ -35,6 +35,8 @@ import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.utils.emptyOrSingletonList +public val LIBRARY_NAME_PREFIX: String = "library " + public abstract class IdeaModuleInfo : ModuleInfo { abstract fun contentScope(): GlobalSearchScope } @@ -128,7 +130,7 @@ private class ModuleTestSourceScope(module: Module) : ModuleSourceScope(module) } public data class LibraryInfo(val project: Project, val library: Library) : IdeaModuleInfo() { - override val name: Name = Name.special("") + override val name: Name = Name.special("<$LIBRARY_NAME_PREFIX${library.getName()}>") override fun contentScope() = LibraryWithoutSourceScope(project, library) @@ -167,7 +169,7 @@ private data class LibrarySourceInfo(val project: Project, val library: Library) //TODO: (module refactoring) there should be separate SdkSourceInfo but there are no kotlin source in existing sdks for now :) public data class SdkInfo(val project: Project, val sdk: Sdk) : IdeaModuleInfo() { - override val name: Name = Name.special("") + override val name: Name = Name.special("<$LIBRARY_NAME_PREFIX${sdk.getName()}>") override fun contentScope() = SdkScope(project, sdk)