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

preserve comments: replace with compile pattern

Browse Source
This commit is contained in:
Anna.Kozlova
2017-11-24 11:34:19 +01:00
parent 7926554bd8
commit 556787e204
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java
+9 -9
View File
@@ -22,6 +22,7 @@ import com.intellij.psi.*;
import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.InspectionGadgetsFix;
import com.siyeh.ig.psiutils.ClassUtils;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.HighlightUtils;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -60,11 +61,12 @@ public class DynamicRegexReplaceableByCompiledPatternInspection extends DynamicR
final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)grandParent;
final PsiExpressionList list = methodCallExpression.getArgumentList();
final PsiExpression[] expressions = list.getExpressions();
CommentTracker commentTracker = new CommentTracker();
@NonNls final StringBuilder fieldText =
new StringBuilder("private static final java.util.regex.Pattern PATTERN = java.util.regex.Pattern.compile(");
final int expressionsLength = expressions.length;
if (expressionsLength > 0) {
fieldText.append(expressions[0].getText());
fieldText.append(commentTracker.markUnchanged(expressions[0]).getText());
}
@NonNls final String methodName = methodExpression.getReferenceName();
final boolean literalReplacement = "replace".equals(methodName);
@@ -75,13 +77,13 @@ public class DynamicRegexReplaceableByCompiledPatternInspection extends DynamicR
@NonNls final StringBuilder expressionText = new StringBuilder("PATTERN.");
final PsiExpression qualifier = methodExpression.getQualifierExpression();
@NonNls final String qualifierText = (qualifier == null) ? "this" : qualifier.getText();
@NonNls final String qualifierText = (qualifier == null) ? "this" : commentTracker.markUnchanged(qualifier).getText();
if ("split".equals(methodName)) {
expressionText.append(methodName);
expressionText.append('(');
expressionText.append(qualifierText);
for (int i = 1; i < expressionsLength; i++) {
expressionText.append(',').append(expressions[i].getText());
expressionText.append(',').append(commentTracker.markUnchanged(expressions[i]).getText());
}
expressionText.append(')');
}
@@ -98,9 +100,9 @@ public class DynamicRegexReplaceableByCompiledPatternInspection extends DynamicR
expressionText.append("java.util.regex.Matcher.quoteReplacement(");
}
if (expressionsLength > 1) {
expressionText.append(expressions[1].getText());
expressionText.append(commentTracker.markUnchanged(expressions[1]).getText());
for (int i = 2; i < expressionsLength; i++) {
expressionText.append(',').append(expressions[i].getText());
expressionText.append(',').append(commentTracker.markUnchanged(expressions[i]).getText());
}
}
if (literalReplacement) {
@@ -110,10 +112,8 @@ public class DynamicRegexReplaceableByCompiledPatternInspection extends DynamicR
}
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
final PsiField newField = factory.createFieldFromText(fieldText.toString(), element);
final PsiElement field = aClass.add(newField);
final PsiExpression newExpression = factory.createExpressionFromText(expressionText.toString(), element);
PsiMethodCallExpression newMethodCallExpression = (PsiMethodCallExpression)methodCallExpression.replace(newExpression);
final PsiElement field = aClass.add(factory.createFieldFromText(fieldText.toString(), element));
PsiMethodCallExpression newMethodCallExpression = (PsiMethodCallExpression)commentTracker.replaceAndRestoreComments(methodCallExpression, expressionText.toString());
newMethodCallExpression = CodeInsightUtilCore.forcePsiPostprocessAndRestoreElement(newMethodCallExpression);
final PsiReferenceExpression reference = getReference(newMethodCallExpression);
HighlightUtils.showRenameTemplate(aClass, (PsiNameIdentifierOwner)field, reference);
plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/replace_with_compiled_pattern/Literal.after.java
+1 -1
View File
@@ -6,6 +6,6 @@ class Literal {
private static final Pattern ABC = Pattern.compile("abc", Pattern.LITERAL);
void f(String text, String replacement) {
ABC.matcher(text).replaceAll(Matcher.quoteReplacement(replacement));
ABC.matcher(text).replaceAll(Matcher.quoteReplacement(replacement));//end line comment
}
}
plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/replace_with_compiled_pattern/Literal.java
+1 -1
View File
@@ -1,6 +1,6 @@
class Literal {
void f(String text, String replacement) {
text.replace<caret>("abc", replacement);
text.replace<caret>("abc", replacement);//end line comment
}
}