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

SSR: fix replacing array initializer removes semicolon (IDEA-192548)

Browse Source
This commit is contained in:
Bas Leijdekkers
2018-06-04 12:54:53 +02:00
parent 5cebf2f239
commit 84f3069914
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java
+9 -9
View File
@@ -803,17 +803,17 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile {
private static int removeExtraSemicolon(ParameterInfo info, int offset, StringBuilder result, MatchResult match) {
if (info.isStatementContext()) {
final int index = offset + info.getStartIndex();
if (result.charAt(index)==';' &&
( match == null ||
final PsiElement matchElement = (match == null) ? null : match.getMatch();
if (result.charAt(index) == ';' &&
( matchElement == null ||
( result.charAt(index-1)=='}' &&
!(match.getMatch() instanceof PsiDeclarationStatement) && // array init in dcl
!(match.getMatch() instanceof PsiNewExpression) // array initializer
!(matchElement instanceof PsiDeclarationStatement) && // array init in dcl
!(matchElement instanceof PsiNewExpression) && // array initializer
!(matchElement instanceof PsiArrayInitializerExpression)
) ||
( !match.isMultipleMatch() && // ; in comment
match.getMatch() instanceof PsiComment
) ||
( match.isMultipleMatch() && // ; in comment
match.getChildren().get( match.getChildren().size() - 1 ).getMatch() instanceof PsiComment
( match.isMultipleMatch() // ; in comment
? match.getChildren().get(match.getChildren().size() - 1).getMatch() instanceof PsiComment
: matchElement instanceof PsiComment
)
)
) {
platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java
+9
View File
@@ -2460,5 +2460,14 @@ public class StructuralReplaceTest extends StructuralReplaceTestCase {
"}",
replace(in, "'_ReturnType '_Method('_ParameterType '_Parameter*);",
"$ReturnType$ $Method$ ($ParameterType$ $Parameter$);", true));
String in2 = "class X {" +
" public final X[] EMPTY_ARRAY = {};" +
"}";
assertEquals("shouldn't delete semicolon",
"class X {" +
" public final X[] EMPTY_ARRAY = {};" +
"}",
replace(in2, "'_FieldType 'Field = '_Init?;", "$FieldType$ $Field$ = $Init$;", true));
}
}