From f837b01f855be09978bf5a9d103b8a266d35bb15 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Fri, 21 Feb 2020 13:06:12 +0700 Subject: [PATCH] i18n: add bundle for idea/hierarchy --- .../messages/KotlinHierarchyBundle.properties | 2 ++ .../idea/hierarchy/KotlinHierarchyBundle.kt | 18 ++++++++++++++++++ .../calls/KotlinCallHierarchyNodeDescriptor.kt | 3 ++- .../KotlinOverrideHierarchyNodeDescriptor.kt | 3 ++- 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 idea/resources/messages/KotlinHierarchyBundle.properties create mode 100644 idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinHierarchyBundle.kt diff --git a/idea/resources/messages/KotlinHierarchyBundle.properties b/idea/resources/messages/KotlinHierarchyBundle.properties new file mode 100644 index 00000000000..6c6e59881ca --- /dev/null +++ b/idea/resources/messages/KotlinHierarchyBundle.properties @@ -0,0 +1,2 @@ +text.anonymous=[anonymous] +text.in=\ in {0} \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinHierarchyBundle.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinHierarchyBundle.kt new file mode 100644 index 00000000000..185c82817e2 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinHierarchyBundle.kt @@ -0,0 +1,18 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.hierarchy + +import org.jetbrains.annotations.NonNls +import org.jetbrains.annotations.PropertyKey +import org.jetbrains.kotlin.util.AbstractKotlinBundle + +@NonNls +private const val BUNDLE = "messages.KotlinHierarchyBundle" + +object KotlinHierarchyBundle : AbstractKotlinBundle(BUNDLE) { + @JvmStatic + fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) +} diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.kt index eb73d20123d..1e74fd59cbd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.kt @@ -30,6 +30,7 @@ import com.intellij.psi.PsiReference import com.intellij.ui.LayeredIcon import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny +import org.jetbrains.kotlin.idea.hierarchy.KotlinHierarchyBundle import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode @@ -162,7 +163,7 @@ class KotlinCallHierarchyNodeDescriptor( elementText = if (element.name != null) { renderClassOrObject(descriptor as ClassDescriptor) } else { - "[anonymous]" + KotlinHierarchyBundle.message("text.anonymous") } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyNodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyNodeDescriptor.kt index 0fe7b1b224d..40233b18257 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyNodeDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyNodeDescriptor.kt @@ -30,6 +30,7 @@ import com.intellij.ui.RowIcon import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.idea.caches.resolve.unsafeResolveToDescriptor import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaMemberDescriptor +import org.jetbrains.kotlin.idea.hierarchy.KotlinHierarchyBundle import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer import org.jetbrains.kotlin.resolve.DescriptorUtils @@ -140,7 +141,7 @@ class KotlinOverrideHierarchyNodeDescriptor( classDescriptor.parents.forEach { parentDescriptor -> when (parentDescriptor) { is MemberDescriptor -> { - addText(" in ${parentDescriptor.name.asString()}", classNameAttributes) + addText(KotlinHierarchyBundle.message("text.in", parentDescriptor.name.asString()), classNameAttributes) if (parentDescriptor is FunctionDescriptor) { addText("()", classNameAttributes) }