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

IDEA-193810 Inspection 'Standard Charset object can be used' doesn't show warning for ASCII

Browse Source
This commit is contained in:
Tagir Valeev
2018-06-13 12:00:01 +07:00
parent ce1cd46ebd
commit b165862051
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/CharsetObjectCanBeUsedInspection.java
+14 -5
View File
@@ -11,10 +11,10 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.ContainerUtil;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.ExpressionUtils;
import com.siyeh.ig.psiutils.ImportUtils;
import one.util.streamex.EntryStream;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.Nls;
@@ -52,8 +52,17 @@ public class CharsetObjectCanBeUsedInspection extends AbstractBaseJavaLocalInspe
new CharsetMethodMatcher(JAVA_UTIL_PROPERTIES, "storeToXML", "java.io.OutputStream", JAVA_LANG_STRING, ""),
};
private static final Set<String> SUPPORTED_CHARSETS =
ContainerUtil.immutableSet("US-ASCII", "ISO-8859-1", "UTF-8", "UTF-16BE", "UTF-16LE", "UTF-16");
private static final Map<String, String> SUPPORTED_CHARSETS =
EntryStream.of(
"US-ASCII", "US_ASCII",
"ASCII", "US_ASCII",
"ISO646-US", "US_ASCII",
"ISO-8859-1", "ISO_8859_1",
"UTF-8", "UTF_8",
"UTF-16BE", "UTF_16BE",
"UTF-16LE", "UTF_16LE",
"UTF-16", "UTF_16"
).toMap();
@NotNull
@Override
@@ -69,7 +78,7 @@ public class CharsetObjectCanBeUsedInspection extends AbstractBaseJavaLocalInspe
if (match == null) return;
String charsetString = getCharsetString(match.myStringCharset);
if (charsetString == null) return;
String constantName = "StandardCharsets." + charsetString.replace('-', '_');
String constantName = "StandardCharsets." + SUPPORTED_CHARSETS.get(charsetString);
holder
.registerProblem(match.myStringCharset, InspectionsBundle.message("inspection.charset.object.can.be.used.message", constantName),
new CharsetObjectCanBeUsedFix(constantName));
@@ -79,7 +88,7 @@ public class CharsetObjectCanBeUsedInspection extends AbstractBaseJavaLocalInspe
private String getCharsetString(PsiExpression charsetExpression) {
charsetExpression = PsiUtil.skipParenthesizedExprDown(charsetExpression);
String charsetString = ObjectUtils.tryCast(ExpressionUtils.computeConstantExpression(charsetExpression), String.class);
if (charsetString == null || !SUPPORTED_CHARSETS.contains(charsetString)) return null;
if (charsetString == null || !SUPPORTED_CHARSETS.containsKey(charsetString)) return null;
if (charsetExpression instanceof PsiLiteralExpression) return charsetString;
if (charsetExpression instanceof PsiReferenceExpression) {
String name = ((PsiReferenceExpression)charsetExpression).getReferenceName();
java/java-tests/testData/inspection/charsetObjectCanBeUsed/afterStringUEEDoubleCatch.java
+2 -2
View File
@@ -1,4 +1,4 @@
// "Replace with 'StandardCharsets.UTF_16'" "true"
// "Replace with 'StandardCharsets.US_ASCII'" "true"
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
@@ -6,7 +6,7 @@ class Test {
void test(byte[] bytes) {
String string = null;
try {
string = new String(bytes, StandardCharsets.UTF_16);
string = new String(bytes, StandardCharsets.US_ASCII);
} catch (Throwable t) {
return;
}
java/java-tests/testData/inspection/charsetObjectCanBeUsed/beforeStringUEEDoubleCatch.java
+2 -2
View File
@@ -1,11 +1,11 @@
// "Replace with 'StandardCharsets.UTF_16'" "true"
// "Replace with 'StandardCharsets.US_ASCII'" "true"
import java.io.UnsupportedEncodingException;
class Test {
void test(byte[] bytes) {
String string = null;
try {
string = new String(bytes, "UTF<caret>-16");
string = new String(bytes, "ASC<caret>II");
}
catch (UnsupportedEncodingException exception) {
exception.printStackTrace();