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

fix StringTokenizerDelimiterInspection (it did not escape double-quote, EA-89721)

Browse Source
This commit is contained in:
Tagir Valeev
2016-10-11 14:18:52 +03:00
parent 4b7e12c95d
commit a5a0a3657b
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/StringTokenizerDelimiterInspection.java
+5 -2
View File
@@ -92,6 +92,7 @@ public class StringTokenizerDelimiterInspection extends BaseJavaBatchLocalInspec
@NotNull
@Override
public String getFamilyName() {
//noinspection DialogTitleCapitalization
return "Replace StringTokenizer delimiters parameter with unique symbols";
}
@@ -99,13 +100,15 @@ public class StringTokenizerDelimiterInspection extends BaseJavaBatchLocalInspec
public void invoke(@NotNull Project project, @NotNull PsiFile file, @NotNull PsiElement startElement, @NotNull PsiElement endElement) {
final Set<Character> uniqueChars = new LinkedHashSet<>();
final PsiLiteralExpression delimiterArgument = (PsiLiteralExpression)startElement;
for (char c : ((String)delimiterArgument.getValue()).toCharArray()) {
final Object literal = delimiterArgument.getValue();
if(!(literal instanceof String)) return;
for (char c : ((String)literal).toCharArray()) {
uniqueChars.add(c);
}
final String newDelimiters = StringUtil.join(uniqueChars, "");
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project);
if (!FileModificationService.getInstance().prepareFileForWrite(file)) return;
delimiterArgument.replace(elementFactory.createExpressionFromText(StringUtil.wrapWithDoubleQuote(StringUtil.escaper(true, null).fun(
delimiterArgument.replace(elementFactory.createExpressionFromText(StringUtil.wrapWithDoubleQuote(StringUtil.escaper(true, "\"").fun(
newDelimiters)), null));
}
}
java/java-tests/testData/inspection/stringTokenizerDelimiter/afterConstructor.java
+1 -1
View File
@@ -5,7 +5,7 @@ class A {
void m() {
new StringTokenizer("asd", "\\\t\nqwerty")
new StringTokenizer("asd", "\"\\\t\nqwerty'")
}
java/java-tests/testData/inspection/stringTokenizerDelimiter/beforeConstructor.java
+1 -1
View File
@@ -5,7 +5,7 @@ class A {
void m() {
new StringTokenizer("asd", "\\\t\t\n<caret>\nqwerty")
new StringTokenizer("asd", "\"\\\t\t\n<caret>\nqwerty''\"")
}