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

Simplify unfolding of properties, fix caret position

Browse Source
This commit is contained in:
Alexey Sedunov
2013-06-10 18:02:15 +04:00
parent 3ab393e460
commit 12ea273ac0
14 changed files with 33 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java
+7 -90
View File
@@ -22,13 +22,7 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.codeInsight.ReferenceToClassesShortening;
import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.Collections;
import org.jetbrains.jet.plugin.codeInsight.codeTransformations.declarations.DeclarationUtils;
public class BranchedUnfoldingUtils {
private BranchedUnfoldingUtils() {
@@ -133,91 +127,14 @@ public class BranchedUnfoldingUtils {
editor.getCaretModel().moveToOffset(resultElement.getTextOffset());
}
private static JetType getPropertyTypeIfNeeded(@NotNull JetProperty property, @NotNull JetFile file) {
if (property.getTypeRef() != null) return null;
return AnalyzerFacadeWithCache.analyzeFileWithCache(file).getBindingContext().get(BindingContext.EXPRESSION_TYPE, property.getInitializer());
public static void unfoldPropertyToIf(@NotNull JetProperty property, @NotNull JetFile file, @NotNull Editor editor) {
JetBinaryExpression assignment = DeclarationUtils.splitPropertyDeclaration(property, file);
unfoldAssignmentToIf(assignment, editor);
}
protected interface PropertyUnfolder<T extends JetExpression> {
void processInitializer(@NotNull T newInitializer, @NotNull JetExpression propertyRef, @NotNull Project project);
}
protected static final PropertyUnfolder<JetIfExpression> IF_EXPRESSION_PROPERTY_UNFOLDER = new PropertyUnfolder<JetIfExpression>() {
@Override
public void processInitializer(
@NotNull JetIfExpression newInitializer, @NotNull JetExpression propertyRef, @NotNull Project project
) {
JetExpression thenExpr = getOutermostLastBlockElement(newInitializer.getThen());
JetExpression elseExpr = getOutermostLastBlockElement(newInitializer.getElse());
assertNotNull(thenExpr);
assertNotNull(elseExpr);
thenExpr.replace(JetPsiFactory.createBinaryExpression(project, propertyRef, "=", thenExpr));
elseExpr.replace(JetPsiFactory.createBinaryExpression(project, propertyRef, "=", elseExpr));
}
};
protected static final PropertyUnfolder<JetWhenExpression> WHEN_EXPRESSION_PROPERTY_UNFOLDER = new PropertyUnfolder<JetWhenExpression>() {
@Override
public void processInitializer(
@NotNull JetWhenExpression newInitializer, @NotNull JetExpression propertyRef, @NotNull Project project
) {
for (JetWhenEntry entry : newInitializer.getEntries()) {
JetExpression currExpr = getOutermostLastBlockElement(entry.getExpression());
assertNotNull(currExpr);
//noinspection ConstantConditions
currExpr.replace(JetPsiFactory.createBinaryExpression(project, propertyRef, "=", currExpr));
}
}
};
private static <T extends JetExpression> void unfoldProperty(
@NotNull JetProperty property, @NotNull JetFile file, PropertyUnfolder<T> unfolder
) {
Project project = property.getProject();
PsiElement parent = property.getParent();
assertNotNull(parent);
//noinspection unchecked
T initializer = (T) property.getInitializer();
assertNotNull(initializer);
JetSimpleNameExpression propertyName = JetPsiFactory.createSimpleName(project, property.getName());
//noinspection ConstantConditions, unchecked
T newInitializer = (T) initializer.copy();
unfolder.processInitializer(newInitializer, propertyName, project);
parent.addAfter(newInitializer, property);
parent.addAfter(JetPsiFactory.createNewLine(project), property);
//noinspection ConstantConditions
JetType inferredType = getPropertyTypeIfNeeded(property, file);
String typeStr = inferredType != null
? DescriptorRenderer.TEXT.renderType(inferredType)
: JetPsiUtil.getNullableText(property.getTypeRef());
property = (JetProperty) property.replace(
JetPsiFactory.createProperty(project, property.getName(), typeStr, property.isVar())
);
if (inferredType != null) {
ReferenceToClassesShortening.compactReferenceToClasses(Collections.singletonList(property.getTypeRef()));
}
}
public static void unfoldPropertyToIf(@NotNull JetProperty property, @NotNull JetFile file) {
unfoldProperty(property, file, IF_EXPRESSION_PROPERTY_UNFOLDER);
}
public static void unfoldPropertyToWhen(@NotNull JetProperty property, @NotNull JetFile file) {
unfoldProperty(property, file, WHEN_EXPRESSION_PROPERTY_UNFOLDER);
public static void unfoldPropertyToWhen(@NotNull JetProperty property, @NotNull JetFile file, @NotNull Editor editor) {
JetBinaryExpression assignment = DeclarationUtils.splitPropertyDeclaration(property, file);
unfoldAssignmentToWhen(assignment, editor);
}
public static void unfoldReturnToIf(@NotNull JetReturnExpression returnExpression) {
idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/UnfoldableKind.java
+2 -2
View File
@@ -35,7 +35,7 @@ public enum UnfoldableKind implements Transformer {
PROPERTY_TO_IF("unfold.property.to.if") {
@Override
public void transform(@NotNull PsiElement element, @NotNull Editor editor, JetFile file) {
BranchedUnfoldingUtils.unfoldPropertyToIf((JetProperty) element, file);
BranchedUnfoldingUtils.unfoldPropertyToIf((JetProperty) element, file, editor);
}
},
RETURN_TO_IF("unfold.return.to.if") {
@@ -53,7 +53,7 @@ public enum UnfoldableKind implements Transformer {
PROPERTY_TO_WHEN("unfold.property.to.when") {
@Override
public void transform(@NotNull PsiElement element, @NotNull Editor editor, JetFile file) {
BranchedUnfoldingUtils.unfoldPropertyToWhen((JetProperty) element, file);
BranchedUnfoldingUtils.unfoldPropertyToWhen((JetProperty) element, file, editor);
}
},
RETURN_TO_WHEN("unfold.return.to.when") {
idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs.kt.after
+2 -2
View File
@@ -1,6 +1,6 @@
fun test(n: Int): String? {
val res:<caret> String?
if (n == 1) {
val res: String?
<caret>if (n == 1) {
res = if (3 > 2) {
println("***")
"one"
idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/nestedIfs2.kt.after
+2 -2
View File
@@ -1,6 +1,6 @@
fun test(n: Int): String? {
var res:<caret> String?
if (n == 1) {
var res: String?
<caret>if (n == 1) {
res = if (3 > 2) {
println("***")
"one"
idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf.kt.after
+2 -2
View File
@@ -1,6 +1,6 @@
fun test(n: Int): String {
val <caret>res: String
if (n == 1) res = "one" else res = "two"
val res: String
<caret>if (n == 1) res = "one" else res = "two"
return res
}
idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIf2.kt.after
+2 -2
View File
@@ -1,6 +1,6 @@
fun test(n: Int): String {
var <caret>res: String
if (n == 1) res = "one" else res = "two"
var res: String
<caret>if (n == 1) res = "one" else res = "two"
return res
}
idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after
+2 -2
View File
@@ -1,6 +1,6 @@
fun test(n: Int): String {
val res<caret>: String
if (n == 1) {
val res: String
<caret>if (n == 1) {
println("***")
res = "one"
} else {
idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after
+2 -2
View File
@@ -1,6 +1,6 @@
fun test(n: Int): String {
var res<caret>: String
if (n == 1) {
var res: String
<caret>if (n == 1) {
println("***")
res = "one"
} else {
idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToIf/simpleIfWithType.kt.after
+2 -2
View File
@@ -1,6 +1,6 @@
fun test(n: Int): String {
val <caret>res: jet.String
if (n == 1) res = "one" else res = "two"
val res: jet.String
<caret>if (n == 1) res = "one" else res = "two"
return res
}
idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen.kt.after
+2 -2
View File
@@ -1,6 +1,6 @@
fun test(n: Int): String? {
val res<caret>: String?
when(n) {
val res: String?
<caret>when(n) {
1 -> res = "one"
2 -> res = "two"
else -> res = null
idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhen2.kt.after
+2 -2
View File
@@ -1,6 +1,6 @@
fun test(n: Int): String? {
var res<caret>: String?
when(n) {
var res: String?
<caret>when(n) {
1 -> res = "one"
2 -> res = "two"
else -> res = null
idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after
+2 -2
View File
@@ -1,6 +1,6 @@
fun test(n: Int): String {
val res<caret>: String
when (n) {
val res: String
<caret>when (n) {
1 -> {
println("***")
res = "one"
idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after
+2 -2
View File
@@ -1,6 +1,6 @@
fun test(n: Int): String {
var res<caret>: String
when (n) {
var res: String
<caret>when (n) {
1 -> {
println("***")
res = "one"
idea/testData/codeInsight/codeTransformations/branched/unfolding/propertyToWhen/simpleWhenWithType.kt.after
+2 -2
View File
@@ -1,6 +1,6 @@
fun test(n: Int): String? {
val res<caret>: jet.String?
when(n) {
val res: jet.String?
<caret>when(n) {
1 -> res = "one"
2 -> res = "two"
else -> res = null