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

Inline callable: keep all usages inside annotation entries

Browse Source 
#KT-24596 Fixed
This commit is contained in:
Mikhail Glukhikh
2019-07-10 11:23:46 +03:00
parent eb00af6b96
commit ee37a0aa9f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/codeInliner/CodeInliner.kt
+1
View File
@@ -81,6 +81,7 @@ class CodeInliner<TCallElement : KtElement>(
&& elementToBeReplaced is KtExpression && elementToBeReplaced is KtExpression
&& !elementToBeReplaced.isUsedAsExpression(bindingContext) && !elementToBeReplaced.isUsedAsExpression(bindingContext)
&& !codeToInline.mainExpression.shouldKeepValue(usageCount = 0) && !codeToInline.mainExpression.shouldKeepValue(usageCount = 0)
&& elementToBeReplaced.getStrictParentOfType<KtAnnotationEntry>() == null
) { ) {
codeToInline.mainExpression = null codeToInline.mainExpression = null
} }
idea/testData/refactoring/inline/inlineVariableOrProperty/InAnnotation.kt
Vendored
+1 -1
View File
@@ -21,5 +21,5 @@ annotation class ExprAnn(val value: String)
val inProperty = TAG val inProperty = TAG
fun foo() { fun foo() {
val x = @ExprAnn(TAG) inProperty @InAnn("Local $TAG") val x = @ExprAnn(TAG) inProperty
} }
idea/testData/refactoring/inline/inlineVariableOrProperty/InAnnotation.kt.after
Vendored
+2 -2
View File
@@ -10,7 +10,7 @@ annotation class InAnn(val value: String)
@InAnn("This is also Tagged") fun bar() {} @InAnn("This is also Tagged") fun bar() {}
fun baz(@InAnn("This is ${} too") x: Int) {} fun baz(@InAnn("This is Tagged too") x: Int) {}
@Target(AnnotationTarget.EXPRESSION) @Target(AnnotationTarget.EXPRESSION)
@Retention(AnnotationRetention.SOURCE) @Retention(AnnotationRetention.SOURCE)
@@ -19,5 +19,5 @@ annotation class ExprAnn(val value: String)
val inProperty = "Tagged" val inProperty = "Tagged"
fun foo() { fun foo() {
val x = @ExprAnn() inProperty @InAnn("Local Tagged") val x = @ExprAnn("Tagged") inProperty
} }