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

SuspiciousDateFormatInspection: revert to hasNeighbor and add negative tests (IDEA-CR-62389)

Browse Source 
GitOrigin-RevId: 57e403967c7c3012baffc5b11ea9a4184d71a99f
This commit is contained in:
Tagir Valeev
2020-05-12 04:54:37 +00:00
committed by intellij-monorepo-bot
parent 525b8d3adc
commit 5fa3538b77
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousDateFormatInspection.java
+8 -12
View File
@@ -106,27 +106,27 @@ public class SuspiciousDateFormatInspection extends AbstractBaseJavaLocalInspect
if (token == null) return null;
switch (token.character) {
case 'Y':
if (!hasNeighbor("w", "", prev, next)) {
if (!hasNeighbor("w", prev, next)) {
return new Problem(token, "week year", "year");
}
break;
case 'M':
if (hasNeighbor("HhKk", "yd", prev, next)) {
if (hasNeighbor("HhKk", prev, next) && !hasNeighbor("yd", prev, next)) {
return new Problem(token, "month", "minute");
}
break;
case 'm':
if (hasNeighbor("yd", "HhKk", prev, next)) {
if (hasNeighbor("yd", prev, next) && !hasNeighbor("HhKk", prev, next)) {
return new Problem(token, "minute", "month");
}
break;
case 'D':
if (hasNeighbor("ML", "", prev, next)) {
if (hasNeighbor("ML", prev, next)) {
return new Problem(token, "day of year", "day of month");
}
break;
case 'S':
if (hasNeighbor("m", "", prev, next)) {
if (hasNeighbor("m", prev, next)) {
return new Problem(token, "milliseconds", "seconds");
}
break;
@@ -134,13 +134,9 @@ public class SuspiciousDateFormatInspection extends AbstractBaseJavaLocalInspect
return null;
}
private boolean hasNeighbor(@NotNull String toMatch, @NotNull String toStop, @Nullable Token prev, @Nullable Token next) {
boolean hasStopMatch =
prev != null && toStop.indexOf(prev.character) >= 0 ||
next != null && toStop.indexOf(next.character) >= 0;
if (hasStopMatch) return false;
return prev != null && toMatch.indexOf(prev.character) >= 0 ||
next != null && toMatch.indexOf(next.character) >= 0;
private boolean hasNeighbor(@NotNull String neighbors, @Nullable Token prev, @Nullable Token next) {
return prev != null && neighbors.indexOf(prev.character) >= 0 ||
next != null && neighbors.indexOf(next.character) >= 0;
}
};
}