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

Fix intention descriptions and templates

Browse Source
This commit is contained in:
Alexey Sedunov
2013-04-15 16:24:39 +04:00
parent 2f00097b2a
commit 9e441b0525
7 changed files with 28 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/after.kt.template
+6 -10
View File
@@ -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"
}
idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/before.kt.template
+6 -10
View File
@@ -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"
}
idea/resources/intentionDescriptions/FoldBranchedExpressionIntention/description.html
+2 -2
View File
@@ -1,6 +1,6 @@
<html>
<body>
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
</body>
</html>
idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/after.kt.template
+6 -10
View File
@@ -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"
}
idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/before.kt.template
+6 -10
View File
@@ -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"
}
idea/resources/intentionDescriptions/UnfoldBranchedExpressionIntention/description.html
+2 -2
View File
@@ -1,6 +1,6 @@
<html>
<body>
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
</body>
</html>
idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/FoldBranchedExpressionIntention.java
-2
View File
@@ -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;