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-52848 (EnumMap intention false positive when LHS type doesn't match)

Browse Source
This commit is contained in:
Bas Leijdekkers
2010-05-10 22:14:49 +02:00
parent ee2d70a6d6
commit d80b024194
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/src/com/siyeh/ig/performance/MapReplaceableByEnumMapInspection.java
+11 -10
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2007 Dave Griffith, Bas Leijdekkers
* Copyright 2003-2010 Dave Griffith, Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,18 +27,21 @@ import org.jetbrains.annotations.NotNull;
public class MapReplaceableByEnumMapInspection extends BaseInspection {
@Override
@NotNull
public String getDisplayName() {
return InspectionGadgetsBundle.message(
"map.replaceable.by.enum.map.display.name");
}
@Override
@NotNull
protected String buildErrorString(Object... infos) {
return InspectionGadgetsBundle.message(
"map.replaceable.by.enum.map.problem.descriptor");
}
@Override
public BaseInspectionVisitor buildVisitor() {
return new SetReplaceableByEnumSetVisitor();
}
@@ -46,7 +49,8 @@ public class MapReplaceableByEnumMapInspection extends BaseInspection {
private static class SetReplaceableByEnumSetVisitor
extends BaseInspectionVisitor {
@Override public void visitNewExpression(@NotNull PsiNewExpression expression) {
@Override public void visitNewExpression(
@NotNull PsiNewExpression expression) {
super.visitNewExpression(expression);
final PsiType type = expression.getType();
if (!(type instanceof PsiClassType)) {
@@ -65,19 +69,16 @@ public class MapReplaceableByEnumMapInspection extends BaseInspection {
return;
}
if (!TypeUtils.expressionHasTypeOrSubtype(expression,
"java.util.Map")) {
"java.util.Map")) {
return;
}
if (TypeUtils.expressionHasTypeOrSubtype(expression,
"java.util.EnumMap")) {
return;
if (null != TypeUtils.expressionHasTypeOrSubtype(expression,
"java.util.EnumMap", "java.util.concurrent.ConcurrentMap")) {
return;
}
final PsiClassType argumentClassType = (PsiClassType)argumentType;
final PsiClass argumentClass = argumentClassType.resolve();
if (argumentClass == null) {
return;
}
if (!argumentClass.isEnum()) {
if (argumentClass == null || !argumentClass.isEnum()) {
return;
}
registerNewExpressionError(expression);
plugins/InspectionGadgets/src/com/siyeh/ig/performance/SetReplaceableByEnumSetInspection.java
+8 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2007 Dave Griffith, Bas Leijdekkers
* Copyright 2003-2010 Dave Griffith, Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,18 +27,21 @@ import org.jetbrains.annotations.NotNull;
public class SetReplaceableByEnumSetInspection extends BaseInspection {
@Override
@NotNull
public String getDisplayName() {
return InspectionGadgetsBundle.message(
"set.replaceable.by.enum.set.display.name");
}
@Override
@NotNull
protected String buildErrorString(Object... infos) {
return InspectionGadgetsBundle.message(
"set.replaceable.by.enum.set.problem.descriptor");
}
@Override
public BaseInspectionVisitor buildVisitor() {
return new SetReplaceableByEnumSetVisitor();
}
@@ -46,7 +49,8 @@ public class SetReplaceableByEnumSetInspection extends BaseInspection {
private static class SetReplaceableByEnumSetVisitor
extends BaseInspectionVisitor {
@Override public void visitNewExpression(@NotNull PsiNewExpression expression) {
@Override public void visitNewExpression(
@NotNull PsiNewExpression expression) {
super.visitNewExpression(expression);
final PsiType type = expression.getType();
if (!(type instanceof PsiClassType)) {
@@ -65,11 +69,11 @@ public class SetReplaceableByEnumSetInspection extends BaseInspection {
return;
}
if (!TypeUtils.expressionHasTypeOrSubtype(expression,
"java.util.Set")) {
"java.util.Set")) {
return;
}
if (TypeUtils.expressionHasTypeOrSubtype(expression,
"java.util.EnumSet")) {
"java.util.EnumSet")) {
return;
}
final PsiClassType argumentClassType = (PsiClassType)argumentType;