Skip to content

Commit d549510

Browse files
VISTALLVISTALL
authored
Merge pull request #3 from unv-unv/inspection-fix-localize
Inspection and quick fixes localize
2 parents fbe01f5 + cc5bed2 commit d549510

53 files changed

Lines changed: 5745 additions & 4654 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎aop-common/src/main/java/com/intellij/aop/jam/AbstractAopInspection.java‎

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -17,66 +17,69 @@
1717
import consulo.language.psi.PsiElementVisitor;
1818
import consulo.language.psi.PsiFile;
1919
import consulo.language.psi.PsiLanguageInjectionHost;
20+
import consulo.localize.LocalizeValue;
2021
import consulo.xml.codeInspection.XmlSuppressableInspectionTool;
2122
import consulo.xml.psi.xml.XmlAttributeValue;
22-
import org.jetbrains.annotations.Nls;
23-
2423
import jakarta.annotation.Nonnull;
2524
import jakarta.annotation.Nullable;
25+
2626
import java.util.List;
2727

2828
/**
2929
* @author peter
3030
*/
3131
public abstract class AbstractAopInspection extends XmlSuppressableInspectionTool {
32-
public boolean isEnabledByDefault() {
33-
return true;
34-
}
32+
public boolean isEnabledByDefault() {
33+
return true;
34+
}
3535

36-
@Nonnull
37-
@Override
38-
public HighlightDisplayLevel getDefaultLevel() {
39-
return HighlightDisplayLevel.WARNING;
40-
}
36+
@Nonnull
37+
@Override
38+
public HighlightDisplayLevel getDefaultLevel() {
39+
return HighlightDisplayLevel.WARNING;
40+
}
4141

42-
@Nullable
43-
@Override
44-
public Language getLanguage() {
45-
return AopPointcutExpressionLanguage.getInstance();
46-
}
42+
@Nullable
43+
@Override
44+
public Language getLanguage() {
45+
return AopPointcutExpressionLanguage.getInstance();
46+
}
4747

48-
@Nonnull
49-
public PsiElementVisitor buildVisitor(@Nonnull final ProblemsHolder holder, final boolean isOnTheFly) {
50-
return new PsiElementVisitor() {
51-
@Override public void visitElement(final PsiElement element) {
52-
if (element instanceof PsiLiteralExpression || element instanceof XmlAttributeValue) {
53-
checkElement(element, holder);
54-
}
55-
}
56-
};
57-
}
48+
@Nonnull
49+
public PsiElementVisitor buildVisitor(@Nonnull final ProblemsHolder holder, final boolean isOnTheFly) {
50+
return new PsiElementVisitor() {
51+
@Override
52+
public void visitElement(final PsiElement element) {
53+
if (element instanceof PsiLiteralExpression || element instanceof XmlAttributeValue) {
54+
checkElement(element, holder);
55+
}
56+
}
57+
};
58+
}
5859

59-
protected void checkElement(final PsiElement element, final ProblemsHolder holder) {
60-
InjectedLanguageManager.getInstance(element.getProject()).enumerate(element, new PsiLanguageInjectionHost.InjectedPsiVisitor() {
61-
public void visit(@Nonnull PsiFile file, @Nonnull List<PsiLanguageInjectionHost.Shred> places) {
62-
if (file instanceof AopPointcutExpressionFile && file.getContext() == element) {
63-
final AopPointcutExpressionFile aopFile = (AopPointcutExpressionFile)file;
64-
final LocalAopModel model = aopFile.getAopModel();
65-
final PsiMethod method = model.getPointcutMethod();
66-
if (method != null) {
67-
checkAopMethod(method, model, holder, aopFile);
68-
}
69-
}
70-
}
71-
});
72-
}
60+
protected void checkElement(final PsiElement element, final ProblemsHolder holder) {
61+
InjectedLanguageManager.getInstance(element.getProject()).enumerate(element, new PsiLanguageInjectionHost.InjectedPsiVisitor() {
62+
public void visit(@Nonnull PsiFile file, @Nonnull List<PsiLanguageInjectionHost.Shred> places) {
63+
if (file instanceof AopPointcutExpressionFile && file.getContext() == element) {
64+
final AopPointcutExpressionFile aopFile = (AopPointcutExpressionFile) file;
65+
final LocalAopModel model = aopFile.getAopModel();
66+
final PsiMethod method = model.getPointcutMethod();
67+
if (method != null) {
68+
checkAopMethod(method, model, holder, aopFile);
69+
}
70+
}
71+
}
72+
});
73+
}
7374

74-
protected abstract void checkAopMethod(final PsiMethod pointcutMethod, final LocalAopModel model, final ProblemsHolder holder,
75-
final AopPointcutExpressionFile aopFile);
75+
protected abstract void checkAopMethod(
76+
final PsiMethod pointcutMethod, final LocalAopModel model, final ProblemsHolder holder,
77+
final AopPointcutExpressionFile aopFile
78+
);
7679

77-
@Nls
78-
@Nonnull
79-
public String getGroupDisplayName() {
80-
return "";
81-
}
80+
@Nonnull
81+
@Override
82+
public LocalizeValue getGroupDisplayName() {
83+
return LocalizeValue.empty();
84+
}
8285
}

‎aop-common/src/main/java/com/intellij/aop/jam/AbstractArgNamesInspection.java‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.intellij.aop.psi.AopPointcutExpressionFile;
1010
import com.intellij.java.language.psi.PsiMethod;
1111
import com.intellij.java.language.psi.PsiParameter;
12+
import consulo.application.Application;
1213
import consulo.language.editor.inspection.ProblemsHolder;
1314
import consulo.language.psi.PsiElement;
1415
import consulo.util.lang.Pair;
@@ -17,25 +18,31 @@
1718
* @author peter
1819
*/
1920
public abstract class AbstractArgNamesInspection extends AbstractAopInspection {
20-
21-
protected void checkAopMethod(final PsiMethod pointcutMethod, final LocalAopModel model, final ProblemsHolder holder,
22-
final AopPointcutExpressionFile aopFile) {
23-
checkAnnotation(pointcutMethod.getParameterList().getParameters(), holder, model.getArgNamesManipulator(), pointcutMethod);
24-
}
25-
26-
@Override
27-
protected void checkElement(final PsiElement element, final ProblemsHolder holder) {
28-
super.checkElement(element, holder);
29-
for (final AopProvider provider : AopProvider.EXTENSION_POINT_NAME.getExtensionList()) {
30-
final Pair<? extends ArgNamesManipulator, PsiMethod> pair = provider.getCustomArgNamesManipulator(element);
31-
if (pair != null) {
32-
final PsiMethod method = pair.second;
33-
checkAnnotation(method.getParameterList().getParameters(), holder, pair.first, method);
34-
}
21+
protected void checkAopMethod(
22+
final PsiMethod pointcutMethod,
23+
final LocalAopModel model,
24+
final ProblemsHolder holder,
25+
final AopPointcutExpressionFile aopFile
26+
) {
27+
checkAnnotation(pointcutMethod.getParameterList().getParameters(), holder, model.getArgNamesManipulator(), pointcutMethod);
3528
}
36-
}
3729

38-
protected abstract void checkAnnotation(final PsiParameter[] parameters, final ProblemsHolder holder,
39-
final ArgNamesManipulator manipulator, final PsiMethod method);
30+
@Override
31+
protected void checkElement(final PsiElement element, final ProblemsHolder holder) {
32+
super.checkElement(element, holder);
33+
Application.get().getExtensionPoint(AopProvider.class).forEach(provider -> {
34+
final Pair<? extends ArgNamesManipulator, PsiMethod> pair = provider.getCustomArgNamesManipulator(element);
35+
if (pair != null) {
36+
final PsiMethod method = pair.second;
37+
checkAnnotation(method.getParameterList().getParameters(), holder, pair.first, method);
38+
}
39+
});
40+
}
4041

42+
protected abstract void checkAnnotation(
43+
final PsiParameter[] parameters,
44+
final ProblemsHolder holder,
45+
final ArgNamesManipulator manipulator,
46+
final PsiMethod method
47+
);
4148
}

0 commit comments

Comments
 (0)