From 82bd796bc007ccae2dcf69228c151e593036e456 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 14 May 2013 17:36:56 +0400 Subject: [PATCH] Add editor reference to transform() method --- .../AbstractCodeTransformationIntention.java | 2 +- .../BranchedUnfoldingUtils.java | 5 +++-- .../branchedTransformations/FoldableKind.java | 11 ++++++----- .../branchedTransformations/UnfoldableKind.java | 13 +++++++------ .../branchedTransformations/core/Transformer.java | 5 +++-- .../intentions/EliminateWhenSubjectIntention.java | 3 ++- .../intentions/FlattenWhenIntention.java | 3 ++- .../intentions/IfToWhenIntention.java | 3 ++- .../intentions/IntroduceWhenSubjectIntention.java | 3 ++- .../intentions/WhenToIfIntention.java | 3 ++- 10 files changed, 30 insertions(+), 21 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/AbstractCodeTransformationIntention.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/AbstractCodeTransformationIntention.java index 28a55d3214b..f30ceb3a156 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/AbstractCodeTransformationIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/AbstractCodeTransformationIntention.java @@ -63,6 +63,6 @@ public abstract class AbstractCodeTransformationIntention assert target != null : "Intention is not applicable"; - transformer.transform(target); + transformer.transform(target, editor); } } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java index e713c50468a..406478d7efc 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/BranchedUnfoldingUtils.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations; +import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -57,7 +58,7 @@ public class BranchedUnfoldingUtils { assert expression != null : UNFOLD_WITHOUT_CHECK; } - public static void unfoldAssignmentToIf(@NotNull JetBinaryExpression assignment) { + public static void unfoldAssignmentToIf(@NotNull JetBinaryExpression assignment, @NotNull Editor editor) { Project project = assignment.getProject(); String op = assignment.getOperationReference().getText(); JetExpression lhs = assignment.getLeft(); @@ -81,7 +82,7 @@ public class BranchedUnfoldingUtils { assignment.replace(newIfExpression); } - public static void unfoldAssignmentToWhen(@NotNull JetBinaryExpression assignment) { + public static void unfoldAssignmentToWhen(@NotNull JetBinaryExpression assignment, @NotNull Editor editor) { Project project = assignment.getProject(); String op = assignment.getOperationReference().getText(); JetExpression lhs = assignment.getLeft(); diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/FoldableKind.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/FoldableKind.java index 0bc3b8e9ac1..e8503d216c0 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/FoldableKind.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/FoldableKind.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations; +import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.JetIfExpression; @@ -25,31 +26,31 @@ import org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransfor public enum FoldableKind implements Transformer { IF_TO_ASSIGNMENT("fold.if.to.assignment") { @Override - public void transform(@NotNull PsiElement element) { + public void transform(@NotNull PsiElement element, @NotNull Editor editor) { BranchedFoldingUtils.foldIfExpressionWithAssignments((JetIfExpression) element); } }, IF_TO_RETURN("fold.if.to.return") { @Override - public void transform(@NotNull PsiElement element) { + public void transform(@NotNull PsiElement element, @NotNull Editor editor) { BranchedFoldingUtils.foldIfExpressionWithReturns((JetIfExpression) element); } }, IF_TO_RETURN_ASYMMETRICALLY("fold.if.to.return") { @Override - public void transform(@NotNull PsiElement element) { + public void transform(@NotNull PsiElement element, @NotNull Editor editor) { BranchedFoldingUtils.foldIfExpressionWithAsymmetricReturns((JetIfExpression) element); } }, WHEN_TO_ASSIGNMENT("fold.when.to.assignment") { @Override - public void transform(@NotNull PsiElement element) { + public void transform(@NotNull PsiElement element, @NotNull Editor editor) { BranchedFoldingUtils.foldWhenExpressionWithAssignments((JetWhenExpression) element); } }, WHEN_TO_RETURN("fold.when.to.return") { @Override - public void transform(@NotNull PsiElement element) { + public void transform(@NotNull PsiElement element, @NotNull Editor editor) { BranchedFoldingUtils.foldWhenExpressionWithReturns((JetWhenExpression) element); } }; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/UnfoldableKind.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/UnfoldableKind.java index c27b330118f..07bf3f3134f 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/UnfoldableKind.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/UnfoldableKind.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations; +import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.JetBinaryExpression; @@ -25,25 +26,25 @@ import org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransfor public enum UnfoldableKind implements Transformer { ASSIGNMENT_TO_IF("unfold.assignment.to.if") { @Override - public void transform(@NotNull PsiElement element) { - BranchedUnfoldingUtils.unfoldAssignmentToIf((JetBinaryExpression) element); + public void transform(@NotNull PsiElement element, @NotNull Editor editor) { + BranchedUnfoldingUtils.unfoldAssignmentToIf((JetBinaryExpression) element, editor); } }, RETURN_TO_IF("unfold.return.to.if") { @Override - public void transform(@NotNull PsiElement element) { + public void transform(@NotNull PsiElement element, @NotNull Editor editor) { BranchedUnfoldingUtils.unfoldReturnToIf((JetReturnExpression) element); } }, ASSIGNMENT_TO_WHEN("unfold.assignment.to.when") { @Override - public void transform(@NotNull PsiElement element) { - BranchedUnfoldingUtils.unfoldAssignmentToWhen((JetBinaryExpression) element); + public void transform(@NotNull PsiElement element, @NotNull Editor editor) { + BranchedUnfoldingUtils.unfoldAssignmentToWhen((JetBinaryExpression) element, editor); } }, RETURN_TO_WHEN("unfold.return.to.when") { @Override - public void transform(@NotNull PsiElement element) { + public void transform(@NotNull PsiElement element, @NotNull Editor editor) { BranchedUnfoldingUtils.unfoldReturnToWhen((JetReturnExpression) element); } }; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/core/Transformer.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/core/Transformer.java index 1693b4b40b8..82f5154f2aa 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/core/Transformer.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/core/Transformer.java @@ -16,11 +16,12 @@ package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.core; +import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; public interface Transformer { @NotNull - public String getKey(); - public void transform(@NotNull PsiElement element); + String getKey(); + void transform(@NotNull PsiElement element, @NotNull Editor editor); } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/EliminateWhenSubjectIntention.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/EliminateWhenSubjectIntention.java index 3ca7101fcf1..225a36b770a 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/EliminateWhenSubjectIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/EliminateWhenSubjectIntention.java @@ -1,6 +1,7 @@ package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions; import com.google.common.base.Predicate; +import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -18,7 +19,7 @@ public class EliminateWhenSubjectIntention extends AbstractCodeTransformationInt } @Override - public void transform(@NotNull PsiElement element) { + public void transform(@NotNull PsiElement element, @NotNull Editor editor) { WhenUtils.eliminateWhenSubject((JetWhenExpression) element); } }; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/FlattenWhenIntention.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/FlattenWhenIntention.java index c7df460ee97..6cc9dc00320 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/FlattenWhenIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/codeTransformations/branchedTransformations/intentions/FlattenWhenIntention.java @@ -1,6 +1,7 @@ package org.jetbrains.jet.plugin.codeInsight.codeTransformations.branchedTransformations.intentions; import com.google.common.base.Predicate; +import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -18,7 +19,7 @@ public class FlattenWhenIntention extends AbstractCodeTransformationIntention