MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

SSR: cleanup

Browse Source
This commit is contained in:
Bas Leijdekkers
2015-05-29 18:26:15 +02:00
parent 0ebd173828
commit a8b486d275
1 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/JavaReplaceHandler.java
+7 -27
View File
@@ -5,7 +5,6 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.javadoc.PsiDocComment;
import com.intellij.psi.xml.XmlText;
import com.intellij.structuralsearch.impl.matcher.JavaMatchingVisitor;
import com.intellij.structuralsearch.impl.matcher.MatcherImplUtil;
import com.intellij.structuralsearch.impl.matcher.PatternTreeContext;
@@ -66,27 +65,15 @@ public class JavaReplaceHandler extends StructuralReplaceHandler {
}
private static boolean isListContext(PsiElement el) {
boolean listContext = false;
final PsiElement parent = el.getParent();
if (parent instanceof PsiParameterList ||
parent instanceof PsiExpressionList ||
parent instanceof PsiCodeBlock ||
parent instanceof PsiClass ||
parent instanceof XmlText ||
(parent instanceof PsiIfStatement &&
(((PsiIfStatement)parent).getThenBranch() == el ||
((PsiIfStatement)parent).getElseBranch() == el
)
) ||
(parent instanceof PsiLoopStatement &&
((PsiLoopStatement)parent).getBody() == el
)
) {
listContext = true;
}
return listContext;
return parent instanceof PsiParameterList ||
parent instanceof PsiExpressionList ||
parent instanceof PsiCodeBlock ||
parent instanceof PsiClass ||
parent instanceof PsiIfStatement && (((PsiIfStatement)parent).getThenBranch() == el ||
((PsiIfStatement)parent).getElseBranch() == el) ||
parent instanceof PsiLoopStatement && ((PsiLoopStatement)parent).getBody() == el;
}
@Nullable
@@ -426,13 +413,6 @@ public class JavaReplaceHandler extends StructuralReplaceHandler {
lastToDelete = nextSibling;
}
if (nextSibling instanceof XmlText && i + 1 < matchSize) {
final PsiElement next = info.getMatch(i + 1);
if (next != null && next == nextSibling.getNextSibling()) {
lastToDelete = nextSibling;
}
}
if (element instanceof PsiExpression) {
final PsiElement parent = element.getParent().getParent();
if ((parent instanceof PsiCall ||