diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/base/Intention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/base/Intention.java index bd28468c66eb..fb21940757b6 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/base/Intention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/base/Intention.java @@ -19,15 +19,16 @@ import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.CaretModel; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; -import com.intellij.psi.*; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.plugins.groovy.annotator.intentions.QuickfixUtil; import org.jetbrains.plugins.groovy.intentions.GroovyIntentionsBundle; import org.jetbrains.plugins.groovy.intentions.utils.BoolUtils; import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; -import org.jetbrains.plugins.groovy.annotator.intentions.QuickfixUtil; public abstract class Intention implements IntentionAction { @@ -51,10 +52,10 @@ public abstract class Intention implements IntentionAction { return; } assert element.isValid() : element; - processIntention(element); + processIntention(element, project, editor); } - protected abstract void processIntention(@NotNull PsiElement element) + protected abstract void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException; @NotNull diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/ConvertClosureArgToItIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/ConvertClosureArgToItIntention.java index 11c5c4e46f7e..17409c93e2c5 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/ConvertClosureArgToItIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/ConvertClosureArgToItIntention.java @@ -15,15 +15,19 @@ */ package org.jetbrains.plugins.groovy.intentions.closure; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.intentions.base.*; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; +import org.jetbrains.plugins.groovy.lang.psi.GroovyRecursiveElementVisitor; import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter; import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameterList; -import org.jetbrains.plugins.groovy.lang.psi.GroovyRecursiveElementVisitor; import java.util.HashSet; import java.util.Set; @@ -36,7 +40,7 @@ public class ConvertClosureArgToItIntention extends Intention { return new SingleArgClosurePredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrClosableBlock closure = (GrClosableBlock) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/EachToForIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/EachToForIntention.java index 02c7185a8daf..8684fcfe2147 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/EachToForIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/EachToForIntention.java @@ -23,7 +23,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; import com.intellij.refactoring.rename.inplace.VariableInplaceRenamer; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -53,27 +52,8 @@ public class EachToForIntention extends Intention { return new EachToForPredicate(); } - private GrVariable var = null; - @Override - public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { - super.invoke(project, editor, file); - if (var == null) return; - - if (ApplicationManager.getApplication().isUnitTestMode()) return; - - final PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project); - final Document doc = documentManager.getDocument(file); - if (doc == null) return; - - - documentManager.doPostponedOperationsAndUnblockDocument(doc); - editor.getCaretModel().moveToOffset(var.getTextOffset()); - new VariableInplaceRenamer(var, editor).performInplaceRename(); - } - - @Override - protected void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + protected void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrMethodCallExpression expression = (GrMethodCallExpression)element; final GrClosableBlock block = expression.getClosureArguments()[0]; final GrParameterList parameterList = block.getParameterList(); @@ -114,7 +94,19 @@ public class EachToForIntention extends Intention { final GrStatement statement = elementFactory.createStatementFromText(builder.toString()); final GrForStatement forStatement = (GrForStatement)expression.replaceWithStatement(statement); final GrForClause clause = forStatement.getClause(); - this.var = clause.getDeclaredVariables()[0]; + GrVariable variable = clause.getDeclaredVariables()[0]; + + if (variable == null) return; + + if (ApplicationManager.getApplication().isUnitTestMode()) return; + + final PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project); + final Document doc = documentManager.getDocument(element.getContainingFile()); + if (doc == null) return; + + documentManager.doPostponedOperationsAndUnblockDocument(doc); + editor.getCaretModel().moveToOffset(variable.getTextOffset()); + new VariableInplaceRenamer(variable, editor).performInplaceRename(); } private static class EachToForPredicate implements PsiElementPredicate { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/ForToEachIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/ForToEachIntention.java index 6950c1af528a..4af91b41ff6a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/ForToEachIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/ForToEachIntention.java @@ -15,6 +15,8 @@ */ package org.jetbrains.plugins.groovy.intentions.closure; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; @@ -39,7 +41,7 @@ public class ForToEachIntention extends Intention { return new ForToEachPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrForStatement parentStatement = (GrForStatement) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/MakeClosureCallExplicitIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/MakeClosureCallExplicitIntention.java index ef5330790085..e1c4a3466ade 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/MakeClosureCallExplicitIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/MakeClosureCallExplicitIntention.java @@ -15,10 +15,14 @@ */ package org.jetbrains.plugins.groovy.intentions.closure; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.intentions.base.*; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList; import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; @@ -32,7 +36,7 @@ public class MakeClosureCallExplicitIntention extends Intention { return new ImplicitClosureCallPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrMethodCallExpression expression = (GrMethodCallExpression) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/MakeClosureCallImplicitIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/MakeClosureCallImplicitIntention.java index 62f0823ec20b..7ad8807d756f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/MakeClosureCallImplicitIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/closure/MakeClosureCallImplicitIntention.java @@ -15,10 +15,14 @@ */ package org.jetbrains.plugins.groovy.intentions.closure; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.intentions.base.*; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList; import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; @@ -33,7 +37,7 @@ public class MakeClosureCallImplicitIntention extends Intention { return new ExplicitClosureCallPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrMethodCallExpression expression = (GrMethodCallExpression) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/ChangeToCStyleCommentIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/ChangeToCStyleCommentIntention.java index aeecd9f44ef9..8c29c0f087f4 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/ChangeToCStyleCommentIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/ChangeToCStyleCommentIntention.java @@ -15,6 +15,8 @@ */ package org.jetbrains.plugins.groovy.intentions.comments; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiComment; import com.intellij.psi.PsiElement; @@ -38,7 +40,7 @@ public class ChangeToCStyleCommentIntention extends Intention { return new EndOfLineCommentPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final PsiComment selectedComment = (PsiComment) element; PsiComment firstComment = selectedComment; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/ChangeToEndOfLineCommentIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/ChangeToEndOfLineCommentIntention.java index 8d046d80f8ce..f6326ad11c31 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/ChangeToEndOfLineCommentIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/comments/ChangeToEndOfLineCommentIntention.java @@ -15,6 +15,8 @@ */ package org.jetbrains.plugins.groovy.intentions.comments; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiComment; import com.intellij.psi.PsiElement; @@ -31,7 +33,7 @@ public class ChangeToEndOfLineCommentIntention extends Intention { return new CStyleCommentPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final PsiComment comment = (PsiComment) element; final JavaPsiFacade manager = JavaPsiFacade.getInstance(comment.getProject()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ConditionalToElvisIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ConditionalToElvisIntention.java index 443c9666aea3..2b142d0f2eaa 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ConditionalToElvisIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ConditionalToElvisIntention.java @@ -16,6 +16,8 @@ package org.jetbrains.plugins.groovy.intentions.control; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -29,7 +31,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpres * @author ilyas */ public class ConditionalToElvisIntention extends Intention { - protected void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + protected void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrConditionalExpression expr = (GrConditionalExpression) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/DemorgansLawIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/DemorgansLawIntention.java index be7500e1b156..6adb2711a649 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/DemorgansLawIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/DemorgansLawIntention.java @@ -15,16 +15,18 @@ */ package org.jetbrains.plugins.groovy.intentions.control; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.intentions.GroovyIntentionsBundle; +import org.jetbrains.plugins.groovy.intentions.base.MutablyNamedIntention; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.intentions.utils.BoolUtils; import org.jetbrains.plugins.groovy.intentions.utils.ComparisonUtils; import org.jetbrains.plugins.groovy.intentions.utils.ParenthesesUtils; -import org.jetbrains.plugins.groovy.intentions.base.MutablyNamedIntention; -import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrBinaryExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; @@ -47,7 +49,7 @@ public class DemorgansLawIntention extends MutablyNamedIntention { return new ConjunctionPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { GrBinaryExpression exp = (GrBinaryExpression) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ExpandBooleanIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ExpandBooleanIntention.java index d07e3eaa1580..049f66254cbc 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ExpandBooleanIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/ExpandBooleanIntention.java @@ -15,11 +15,15 @@ */ package org.jetbrains.plugins.groovy.intentions.control; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.intentions.base.*; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.branch.GrReturnStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrAssignmentExpression; @@ -33,7 +37,7 @@ public class ExpandBooleanIntention extends Intention { return new ExpandBooleanPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrStatement containingStatement = (GrStatement) element; if (ExpandBooleanPredicate.isBooleanAssignment(containingStatement)) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipComparisonIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipComparisonIntention.java index b6fb61b55734..639c3db3b54e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipComparisonIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipComparisonIntention.java @@ -15,13 +15,17 @@ */ package org.jetbrains.plugins.groovy.intentions.control; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.intentions.GroovyIntentionsBundle; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.MutablyNamedIntention; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.intentions.utils.ComparisonUtils; -import org.jetbrains.plugins.groovy.intentions.base.*; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrBinaryExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; @@ -41,7 +45,7 @@ public class FlipComparisonIntention extends MutablyNamedIntention { return new ComparisonPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrBinaryExpression exp = (GrBinaryExpression) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipConditionalIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipConditionalIntention.java index 4581f158dfbe..a7d86a96eda0 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipConditionalIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipConditionalIntention.java @@ -15,11 +15,15 @@ */ package org.jetbrains.plugins.groovy.intentions.control; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.intentions.utils.BoolUtils; -import org.jetbrains.plugins.groovy.intentions.base.*; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrConditionalExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; @@ -31,7 +35,7 @@ public class FlipConditionalIntention extends Intention { return new ConditionalPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrConditionalExpression exp = (GrConditionalExpression) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipConjunctionIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipConjunctionIntention.java index 85750395f256..78cba4b935b0 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipConjunctionIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/FlipConjunctionIntention.java @@ -15,12 +15,16 @@ */ package org.jetbrains.plugins.groovy.intentions.control; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.intentions.GroovyIntentionsBundle; -import org.jetbrains.plugins.groovy.intentions.base.*; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.MutablyNamedIntention; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrBinaryExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; @@ -45,7 +49,7 @@ public class FlipConjunctionIntention extends MutablyNamedIntention { return new ConjunctionPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrBinaryExpression exp = (GrBinaryExpression) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeElseIfIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeElseIfIntention.java index 16eb527880b7..d6d9f1c58c34 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeElseIfIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeElseIfIntention.java @@ -15,13 +15,17 @@ */ package org.jetbrains.plugins.groovy.intentions.control; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.intentions.base.*; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; +import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrBlockStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrIfStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement; -import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrBlockStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrOpenBlock; public class MergeElseIfIntention extends Intention { @@ -31,7 +35,7 @@ public class MergeElseIfIntention extends Intention { return new MergeElseIfPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrIfStatement parentStatement = (GrIfStatement) element; GrBlockStatement elseBlockStatement = (GrBlockStatement) parentStatement.getElseBranch(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeIfAndIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeIfAndIntention.java index 0b888616baa7..83146f354a44 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeIfAndIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/MergeIfAndIntention.java @@ -15,13 +15,17 @@ */ package org.jetbrains.plugins.groovy.intentions.control; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.intentions.utils.ConditionalUtils; import org.jetbrains.plugins.groovy.intentions.utils.ParenthesesUtils; -import org.jetbrains.plugins.groovy.intentions.base.*; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrIfStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; @@ -34,7 +38,7 @@ public class MergeIfAndIntention extends Intention { return new MergeIfAndPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrIfStatement parentStatement = (GrIfStatement) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/NegateComparisonIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/NegateComparisonIntention.java index f533fe268df4..16d1ddccca0f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/NegateComparisonIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/NegateComparisonIntention.java @@ -15,14 +15,16 @@ */ package org.jetbrains.plugins.groovy.intentions.control; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.intentions.GroovyIntentionsBundle; -import org.jetbrains.plugins.groovy.intentions.utils.ComparisonUtils; import org.jetbrains.plugins.groovy.intentions.base.MutablyNamedIntention; import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; +import org.jetbrains.plugins.groovy.intentions.utils.ComparisonUtils; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrBinaryExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; @@ -42,7 +44,7 @@ public class NegateComparisonIntention extends MutablyNamedIntention { return new ComparisonPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrBinaryExpression exp = (GrBinaryExpression) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SplitElseIfIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SplitElseIfIntention.java index fad62cd1ddbb..7bf1a4b1d1a8 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SplitElseIfIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SplitElseIfIntention.java @@ -15,10 +15,14 @@ */ package org.jetbrains.plugins.groovy.intentions.control; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.intentions.base.*; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrIfStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement; @@ -29,7 +33,7 @@ public class SplitElseIfIntention extends Intention { return new SplitElseIfPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrIfStatement parentStatement = (GrIfStatement) element; assert parentStatement != null; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertClosureToMethodIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertClosureToMethodIntention.java index edabc9940fbb..c3ed59c7c061 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertClosureToMethodIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertClosureToMethodIntention.java @@ -16,6 +16,8 @@ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -40,7 +42,7 @@ public class ConvertClosureToMethodIntention extends Intention { } @Override - protected void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + protected void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { element = element.getParent(); StringBuilder builder = new StringBuilder(element.getTextLength()); final GrField field = (GrField)element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertConcatenationToGstringIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertConcatenationToGstringIntention.java index 5e21af14a682..06fbe0e7217f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertConcatenationToGstringIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertConcatenationToGstringIntention.java @@ -16,6 +16,8 @@ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.MethodSignatureUtil; import com.intellij.psi.util.TypeConversionUtil; @@ -50,7 +52,7 @@ public class ConvertConcatenationToGstringIntention extends Intention { } @Override - protected void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + protected void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { StringBuilder builder = new StringBuilder(element.getTextLength()); if (element instanceof GrBinaryExpression) { performIntention((GrBinaryExpression)element, builder); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertGStringToStringIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertGStringToStringIntention.java index e22e9c7d93dd..9927634ca468 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertGStringToStringIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertGStringToStringIntention.java @@ -15,6 +15,8 @@ */ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.CommonClassNames; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiType; @@ -44,7 +46,7 @@ public class ConvertGStringToStringIntention extends Intention { return new ConvertibleGStringLiteralPredicate(); } - public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrLiteral exp = (GrLiteral)element; IntentionUtils.replaceExpression(convertGStringLiteralToStringLiteral(exp), exp); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToDecimalIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToDecimalIntention.java index 982c182bc33c..cc3068dba5c2 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToDecimalIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToDecimalIntention.java @@ -15,11 +15,15 @@ */ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.intentions.base.*; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals.GrLiteral; import java.math.BigInteger; @@ -31,7 +35,7 @@ public class ConvertIntegerToDecimalIntention extends Intention { return new ConvertIntegerToDecimalPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrLiteral exp = (GrLiteral) element; @NonNls String textString = exp.getText(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToHexIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToHexIntention.java index 939d7b0d2b3e..fcdabe0042ae 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToHexIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToHexIntention.java @@ -15,11 +15,15 @@ */ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.intentions.base.*; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals.GrLiteral; import java.math.BigInteger; @@ -32,7 +36,7 @@ public class ConvertIntegerToHexIntention extends Intention { return new ConvertIntegerToHexPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrLiteral exp = (GrLiteral) element; String textString = exp.getText(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToOctalIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToOctalIntention.java index c1cb92a1a6af..2f3e131041dc 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToOctalIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertIntegerToOctalIntention.java @@ -15,11 +15,15 @@ */ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.intentions.base.*; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals.GrLiteral; import java.math.BigInteger; @@ -32,7 +36,7 @@ public class ConvertIntegerToOctalIntention extends Intention { return new ConvertIntegerToOctalPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrLiteral exp = (GrLiteral) element; @NonNls String textString = exp.getText(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertJavaStyleArrayIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertJavaStyleArrayIntention.java index f020043ac304..27f76089daae 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertJavaStyleArrayIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertJavaStyleArrayIntention.java @@ -15,6 +15,8 @@ */ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -31,7 +33,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrM */ public class ConvertJavaStyleArrayIntention extends Intention { @Override - protected void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + protected void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrClosableBlock block = ((GrMethodCallExpression)element).getClosureArguments()[0]; final String text = block.getText(); int start = block.getLBrace().getStartOffsetInParent() + 1; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertMethodToClosureIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertMethodToClosureIntention.java index 5fb904c346c1..7823410e28b3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertMethodToClosureIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertMethodToClosureIntention.java @@ -16,6 +16,8 @@ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -40,7 +42,7 @@ public class ConvertMethodToClosureIntention extends Intention { } @Override - protected void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + protected void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { element = element.getParent(); final GrMethod method = (GrMethod)element; StringBuilder builder = new StringBuilder(method.getTextLength()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertStringToGStringIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertStringToGStringIntention.java index 3a91c51b61fc..28c20a003cc1 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertStringToGStringIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertStringToGStringIntention.java @@ -15,10 +15,14 @@ */ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.intentions.base.*; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals.GrLiteral; public class ConvertStringToGStringIntention extends Intention { @@ -28,7 +32,7 @@ public class ConvertStringToGStringIntention extends Intention { return new StringLiteralPredicate(); } - public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrLiteral exp = (GrLiteral)element; final String textString = exp.getText(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexedExpressionConversionIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexedExpressionConversionIntention.java index a5350f0b5e48..82cac5901800 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexedExpressionConversionIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexedExpressionConversionIntention.java @@ -15,6 +15,8 @@ */ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -33,7 +35,7 @@ public class IndexedExpressionConversionIntention extends Intention { return new IndexedExpressionConversionPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrIndexProperty arrayIndexExpression = (GrIndexProperty) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexingMethodConversionIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexingMethodConversionIntention.java index deb1f0f45462..54bd5373c3ac 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexingMethodConversionIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/IndexingMethodConversionIntention.java @@ -15,15 +15,19 @@ */ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.intentions.base.*; +import org.jetbrains.plugins.groovy.intentions.base.Intention; +import org.jetbrains.plugins.groovy.intentions.base.IntentionUtils; +import org.jetbrains.plugins.groovy.intentions.base.PsiElementPredicate; +import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrMethodCallExpression; -import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList; public class IndexingMethodConversionIntention extends Intention { @@ -32,7 +36,7 @@ public class IndexingMethodConversionIntention extends Intention { return new IndexingMethodConversionPredicate(); } - public void processIntention(@NotNull PsiElement element) + public void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrMethodCallExpression callExpression = (GrMethodCallExpression) element; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/RemoveParenthesesFromMethodCallIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/RemoveParenthesesFromMethodCallIntention.java index 25b2c85536a3..5a403cd849a7 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/RemoveParenthesesFromMethodCallIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/RemoveParenthesesFromMethodCallIntention.java @@ -15,6 +15,8 @@ */ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -39,7 +41,7 @@ public class RemoveParenthesesFromMethodCallIntention extends Intention { return element instanceof GrStatementOwner; } - protected void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + protected void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { final GrMethodCallExpression expression = (GrMethodCallExpression) element; final StringBuilder newStatementText = new StringBuilder(); newStatementText.append(expression.getInvokedExpression().getText()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/RemoveUnnecessaryBracesInGStringIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/RemoveUnnecessaryBracesInGStringIntention.java index 697767a09aaa..ffb96c217245 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/RemoveUnnecessaryBracesInGStringIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/RemoveUnnecessaryBracesInGStringIntention.java @@ -16,6 +16,8 @@ package org.jetbrains.plugins.groovy.intentions.conversions; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -36,7 +38,7 @@ public class RemoveUnnecessaryBracesInGStringIntention extends Intention { } @Override - protected void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + protected void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { GrStringUtil.removeUnnecessaryBracesInGString((GrString)element); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/JavaStylePropertiesInvocationIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/JavaStylePropertiesInvocationIntention.java index d905a09b5214..723d2d25ed34 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/JavaStylePropertiesInvocationIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/JavaStylePropertiesInvocationIntention.java @@ -16,6 +16,8 @@ package org.jetbrains.plugins.groovy.intentions.style; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; @@ -31,6 +33,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrCall; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrMethodCallExpression; + import static org.jetbrains.plugins.groovy.lang.psi.util.PsiElementUtil.*; /** @@ -42,7 +45,7 @@ public class JavaStylePropertiesInvocationIntention extends Intention { return super.isStopElement(element) || element instanceof GrClosableBlock; } - protected void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + protected void processIntention(@NotNull PsiElement element, Project project, Editor editor) throws IncorrectOperationException { assert element instanceof GrMethodCallExpression || element instanceof GrApplicationStatement; GrCall call = ((GrCall) element); GrExpression invoked = call instanceof GrMethodCallExpression ? diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java index 2404e622ad29..f89f4877b86b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/ReplaceAbstractClassInstanceByMapIntention.java @@ -16,6 +16,7 @@ package org.jetbrains.plugins.groovy.intentions.style; +import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.infos.CandidateInfo; @@ -51,12 +52,12 @@ public class ReplaceAbstractClassInstanceByMapIntention extends Intention { } @Override - protected void processIntention(@NotNull PsiElement psiElement) throws IncorrectOperationException { - Project project = psiElement.getProject(); + protected void processIntention(@NotNull PsiElement psiElement, Project project, Editor editor) throws IncorrectOperationException { PsiDocumentManager.getInstance(project).commitAllDocuments(); final GrNewExpression newExpr = (GrNewExpression)psiElement; GrCodeReferenceElement ref = newExpr.getReferenceElement(); + assert ref != null; final PsiElement resolved = ref.resolve(); assert resolved instanceof PsiClass;// && ((PsiClass)resolved).isInterface(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java index 494bdb90eb55..66f6664d2b6e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java @@ -18,6 +18,7 @@ package org.jetbrains.plugins.groovy.intentions.style.parameterToEntry; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.editor.Editor; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.Task; @@ -83,8 +84,7 @@ public class ConvertParameterToMapEntryIntention extends Intention { @NonNls private static final String MAP_TYPE_TEXT = "Map"; @NonNls private static final String[] MY_POSSIBLE_NAMES = new String[]{"attrs", "args", "params", "map"}; - protected void processIntention(@NotNull final PsiElement element) throws IncorrectOperationException { - final Project project = element.getProject(); + protected void processIntention(@NotNull final PsiElement element, final Project project, Editor editor) throws IncorrectOperationException { // Method or closure to be refactored final GrParametersOwner owner = PsiTreeUtil.getParentOfType(element, GrParametersOwner.class); final Collection occurrences = new ArrayList();