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

i18n: make text from intention lazy

Browse Source 
#KT-37483
This commit is contained in:
Dmitry Gridin
2020-04-04 00:44:13 +07:00
parent f451cb93da
commit 423a9dd70d
97 changed files with 673 additions and 1155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SelfTargetingIntention.kt
+8 -12
View File
@@ -29,7 +29,6 @@ abstract class SelfTargetingIntention<TElement : PsiElement>(
@Nls private var textGetter: () -> String,
@Nls private val familyNameGetter: () -> String = textGetter,
) : IntentionAction {
@Deprecated("Replace with primary constructor", ReplaceWith("SelfTargetingIntention<TElement>(elementType, { text }, { familyName })"))
constructor(
elementType: Class<TElement>,
@@ -38,7 +37,7 @@ abstract class SelfTargetingIntention<TElement : PsiElement>(
) : this(elementType, { text }, { familyName })
protected val defaultText: String get() = defaultTextGetter()
private val defaultTextGetter: () -> String = textGetter
protected val defaultTextGetter: () -> String = textGetter
@Deprecated("Replace with `setTextGetter`", ReplaceWith("setTextGetter { text }"))
protected fun setText(@Nls text: String) {
@@ -62,15 +61,9 @@ abstract class SelfTargetingIntention<TElement : PsiElement>(
val commonParent = if (leaf1 != null && leaf2 != null) PsiTreeUtil.findCommonParent(leaf1, leaf2) else null
var elementsToCheck: Sequence<PsiElement> = emptySequence()
if (leaf1 != null) {
elementsToCheck += leaf1.parentsWithSelf.takeWhile { it != commonParent }
}
if (leaf2 != null) {
elementsToCheck += leaf2.parentsWithSelf.takeWhile { it != commonParent }
}
if (commonParent != null && commonParent !is PsiFile) {
elementsToCheck += commonParent.parentsWithSelf
}
if (leaf1 != null) elementsToCheck += leaf1.parentsWithSelf.takeWhile { it != commonParent }
if (leaf2 != null) elementsToCheck += leaf2.parentsWithSelf.takeWhile { it != commonParent }
if (commonParent != null && commonParent !is PsiFile) elementsToCheck += commonParent.parentsWithSelf
for (element in elementsToCheck) {
@Suppress("UNCHECKED_CAST")
@@ -130,7 +123,10 @@ abstract class SelfTargetingRangeIntention<TElement : PsiElement>(
@Nls familyNameGetter: () -> String = textGetter,
) : SelfTargetingIntention<TElement>(elementType, textGetter, familyNameGetter) {
@Deprecated("Replace with primary constructor", ReplaceWith("SelfTargetingRangeIntention<TElement>(elementType, { text }, { familyName })"))
@Deprecated(
"Replace with primary constructor",
ReplaceWith("SelfTargetingRangeIntention<TElement>(elementType, { text }, { familyName })")
)
constructor(
elementType: Class<TElement>,
@Nls text: String,