diff --git a/idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/after.kt.template b/idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/after.kt.template index 79454db998b..2a07dd895ee 100644 --- a/idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/after.kt.template +++ b/idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/after.kt.template @@ -1,11 +1,7 @@ -public class MyClass { - public fun f(a: Int): String { - var res: String - - res = if (a == 1) "one"; - else if (a == 2) "two"; - else "too many"; - - return res; - } +res = if (n == 1) { + println("***") + "one" +} else { + println("***") + "two" } \ No newline at end of file diff --git a/idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/before.kt.template b/idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/before.kt.template index f77b5f803e3..e61b2e5599b 100644 --- a/idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/before.kt.template +++ b/idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/before.kt.template @@ -1,11 +1,7 @@ -public class MyClass { - public fun f(a: Int): String { - var res: String - - if (a == 1) res = "one"; - else if (a == 2) res = "two"; - else res = "too many"; - - return res; - } +if (n == 1) { + println("***") + res = "one" +} else { + println("***") + res = "two" } \ No newline at end of file diff --git a/idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/description.html b/idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/description.html index bdb8e184981..256249f1e15 100644 --- a/idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/description.html +++ b/idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/description.html @@ -1,6 +1,6 @@ -This intention converts 'if' statement where each branch is terminated with assignment to the same variable -into single assignment with 'if' expression +This intention converts branched (if/when) expression where each branch is terminated with assignment/return/method call into single +assignment/return/method call with branched expression as argument \ No newline at end of file diff --git a/idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/after.kt.template b/idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/after.kt.template index f77b5f803e3..e61b2e5599b 100644 --- a/idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/after.kt.template +++ b/idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/after.kt.template @@ -1,11 +1,7 @@ -public class MyClass { - public fun f(a: Int): String { - var res: String - - if (a == 1) res = "one"; - else if (a == 2) res = "two"; - else res = "too many"; - - return res; - } +if (n == 1) { + println("***") + res = "one" +} else { + println("***") + res = "two" } \ No newline at end of file diff --git a/idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/before.kt.template b/idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/before.kt.template index 79454db998b..2a07dd895ee 100644 --- a/idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/before.kt.template +++ b/idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/before.kt.template @@ -1,11 +1,7 @@ -public class MyClass { - public fun f(a: Int): String { - var res: String - - res = if (a == 1) "one"; - else if (a == 2) "two"; - else "too many"; - - return res; - } +res = if (n == 1) { + println("***") + "one" +} else { + println("***") + "two" } \ No newline at end of file diff --git a/idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/description.html b/idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/description.html index bac916bbe3e..e130de78a1b 100644 --- a/idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/description.html +++ b/idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/description.html @@ -1,6 +1,6 @@ -This intention converts assignment with 'if' expression as right-hand side -into 'if' statement where each branch is terminated with assignment to the original variable +This intention converts assignment/return/method call with branched (if/when) expression as argument +to branched expression where each branch is terminated with assignment/return/method call \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/FoldBranchedExpressionIntention.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/FoldBranchedExpressionIntention.java index 8f25d6f40cd..89e67823803 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/FoldBranchedExpressionIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/FoldBranchedExpressionIntention.java @@ -21,13 +21,11 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetExpression; -import org.jetbrains.jet.lang.psi.JetIfExpression; import org.jetbrains.jet.lang.psi.JetPsiUtil; import org.jetbrains.jet.plugin.JetBundle;