From 1da51c118ed000bac97a0d69bc104153ad230730 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 9 Apr 2019 16:34:33 +0300 Subject: [PATCH] Minor: fix too long strings --- .../idea/caches/resolve/IDEKotlinAsJavaSupport.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt index 3d5b957fda3..2e87cc675ad 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDEKotlinAsJavaSupport.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.utils.sure import java.util.* -class IDEKotlinAsJavaSupport(private val project: Project): KotlinAsJavaSupport() { +class IDEKotlinAsJavaSupport(private val project: Project) : KotlinAsJavaSupport() { private val psiManager: PsiManager = PsiManager.getInstance(project) override fun getFacadeNames(packageFqName: FqName, scope: GlobalSearchScope): Collection { @@ -180,7 +180,7 @@ class IDEKotlinAsJavaSupport(private val project: Project): KotlinAsJavaSupport( private fun findPackageParts(fqName: FqName, scope: GlobalSearchScope): List { val facadeKtFiles = StaticFacadeIndexUtil.getMultifileClassForPart(fqName, scope, project) val partShortName = fqName.shortName().asString() - val partClassFileShortName = partShortName + ".class" + val partClassFileShortName = "$partShortName.class" return facadeKtFiles.mapNotNull { facadeKtFile -> if (facadeKtFile is KtClsFile) { @@ -259,12 +259,17 @@ class IDEKotlinAsJavaSupport(private val project: Project): KotlinAsJavaSupport( val relativeFqName = getClassRelativeName(decompiledClassOrObject) val iterator = relativeFqName.pathSegments().iterator() val base = iterator.next() - assert(rootLightClassForDecompiledFile.name == base.asString()) { "Light class for file:\n" + decompiledClassOrObject.containingKtFile.virtualFile.canonicalPath + "\nwas expected to have name: " + base.asString() + "\n Actual: " + rootLightClassForDecompiledFile.name } + assert(rootLightClassForDecompiledFile.name == base.asString()) { + "Light class for file:\n" + decompiledClassOrObject.containingKtFile.virtualFile.canonicalPath + + "\nwas expected to have name: " + base.asString() + + "\n Actual: " + rootLightClassForDecompiledFile.name + } var current: KtLightClassForDecompiledDeclaration = rootLightClassForDecompiledFile while (iterator.hasNext()) { val name = iterator.next() val innerClass = current.findInnerClassByName(name.asString(), false).sure { - "Could not find corresponding inner/nested class " + relativeFqName + " in class " + decompiledClassOrObject.fqName + "\n" + "File: " + decompiledClassOrObject.containingKtFile.virtualFile.name + "Could not find corresponding inner/nested class " + relativeFqName + " in class " + decompiledClassOrObject.fqName + "\n" + + "File: " + decompiledClassOrObject.containingKtFile.virtualFile.name } current = innerClass as KtLightClassForDecompiledDeclaration }