Skip to content

Commit bf5a7e4

Browse files
UCT-715: Refactored using deprecated property inspection
1 parent b4eda9a commit bf5a7e4

File tree

1 file changed

+54
-63
lines changed

1 file changed

+54
-63
lines changed

src/com/magento/idea/magento2uct/inspections/php/deprecation/UsingDeprecatedProperty.java

Lines changed: 54 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -8,84 +8,75 @@
88
import com.intellij.codeInspection.ProblemHighlightType;
99
import com.intellij.codeInspection.ProblemsHolder;
1010
import com.intellij.openapi.project.Project;
11-
import com.intellij.psi.PsiElement;
12-
import com.intellij.psi.PsiElementVisitor;
13-
import com.intellij.psi.PsiFile;
14-
import com.jetbrains.php.lang.inspections.PhpInspection;
11+
import com.jetbrains.php.lang.psi.elements.ClassConstantReference;
1512
import com.jetbrains.php.lang.psi.elements.Field;
1613
import com.jetbrains.php.lang.psi.elements.FieldReference;
1714
import com.jetbrains.php.lang.psi.elements.PhpClass;
18-
import com.jetbrains.php.lang.psi.visitors.PhpElementVisitor;
15+
import com.jetbrains.php.lang.psi.elements.impl.ClassConstImpl;
1916
import com.magento.idea.magento2uct.inspections.UctProblemsHolder;
17+
import com.magento.idea.magento2uct.inspections.php.UsedFieldInspection;
18+
import com.magento.idea.magento2uct.packages.IssueSeverityLevel;
2019
import com.magento.idea.magento2uct.packages.SupportedIssue;
21-
import com.magento.idea.magento2uct.settings.UctSettingsService;
2220
import com.magento.idea.magento2uct.versioning.VersionStateManager;
2321
import org.jetbrains.annotations.NotNull;
2422

25-
public class UsingDeprecatedProperty extends PhpInspection {
23+
public class UsingDeprecatedProperty extends UsedFieldInspection {
2624

2725
@Override
28-
@SuppressWarnings("PMD.CognitiveComplexity")
29-
public @NotNull PsiElementVisitor buildVisitor(
26+
protected void execute(
27+
final Project project,
3028
final @NotNull ProblemsHolder problemsHolder,
31-
final boolean isOnTheFly
29+
final Field field,
30+
final FieldReference fieldReference
3231
) {
33-
return new PhpElementVisitor() {
34-
35-
@Override
36-
public void visitPhpFieldReference(final FieldReference fieldReference) {
37-
final Project project = fieldReference.getProject();
38-
final UctSettingsService settings = UctSettingsService.getInstance(project);
39-
40-
if (!settings.isEnabled() || !settings.isIssueLevelSatisfiable(
41-
SupportedIssue.USING_DEPRECATED_PROPERTY.getLevel())
42-
) {
43-
return;
44-
}
45-
final PsiElement element = fieldReference.resolve();
46-
final PsiFile file = fieldReference.getContainingFile();
47-
48-
if (!(element instanceof Field) || element.getContainingFile().equals(file)) {
49-
return;
50-
}
51-
final Field field = (Field) element;
32+
if (VersionStateManager.getInstance(project).isDeprecated(field.getFQN())) {
33+
if (problemsHolder instanceof UctProblemsHolder) {
34+
((UctProblemsHolder) problemsHolder).setReservedErrorCode(
35+
SupportedIssue.USING_DEPRECATED_PROPERTY.getCode()
36+
);
37+
}
38+
problemsHolder.registerProblem(
39+
fieldReference,
40+
SupportedIssue.USING_DEPRECATED_PROPERTY.getMessage(
41+
field.getFQN().replace(".", "::")
42+
),
43+
ProblemHighlightType.LIKE_DEPRECATED
44+
);
45+
} else {
46+
final PhpClass containingClass = field.getContainingClass();
5247

53-
if (VersionStateManager.getInstance(project).isDeprecated(field.getFQN())) {
54-
if (problemsHolder instanceof UctProblemsHolder) {
55-
((UctProblemsHolder) problemsHolder).setReservedErrorCode(
56-
SupportedIssue.USING_DEPRECATED_PROPERTY.getCode()
57-
);
58-
}
59-
problemsHolder.registerProblem(
60-
fieldReference,
61-
SupportedIssue.USING_DEPRECATED_PROPERTY.getMessage(
62-
field.getFQN().replace(".", "::")
63-
),
64-
ProblemHighlightType.LIKE_DEPRECATED
48+
if (containingClass == null) {
49+
return;
50+
}
51+
if (VersionStateManager.getInstance(project).isDeprecated(containingClass.getFQN())) {
52+
if (problemsHolder instanceof UctProblemsHolder) {
53+
((UctProblemsHolder) problemsHolder).setReservedErrorCode(
54+
SupportedIssue.USING_DEPRECATED_PROPERTY.getCode()
6555
);
66-
} else {
67-
final PhpClass containingClass = field.getContainingClass();
68-
69-
if (containingClass == null) {
70-
return;
71-
}
72-
if (VersionStateManager.getInstance(project)
73-
.isDeprecated(containingClass.getFQN())) {
74-
if (problemsHolder instanceof UctProblemsHolder) {
75-
((UctProblemsHolder) problemsHolder).setReservedErrorCode(
76-
SupportedIssue.USING_DEPRECATED_PROPERTY.getCode()
77-
);
78-
}
79-
problemsHolder.registerProblem(
80-
fieldReference,
81-
SupportedIssue.USING_DEPRECATED_PROPERTY.getMessage(
82-
field.getFQN().replace(".", "::")
83-
),
84-
ProblemHighlightType.LIKE_DEPRECATED
85-
);
86-
}
8756
}
57+
problemsHolder.registerProblem(
58+
fieldReference,
59+
SupportedIssue.USING_DEPRECATED_PROPERTY.getMessage(
60+
field.getFQN().replace(".", "::")
61+
),
62+
ProblemHighlightType.LIKE_DEPRECATED
63+
);
8864
}
89-
};
65+
}
66+
}
67+
68+
@Override
69+
protected void execute(
70+
final Project project,
71+
final @NotNull ProblemsHolder problemsHolder,
72+
final ClassConstImpl constant,
73+
final ClassConstantReference constantReference
74+
) {
75+
// We do not need to check constant in the field inspection.
76+
}
77+
78+
@Override
79+
protected IssueSeverityLevel getSeverityLevel() {
80+
return SupportedIssue.USING_DEPRECATED_PROPERTY.getLevel();
9081
}
9182
}

0 commit comments

Comments
 (0)