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

Inspections - pass onTheFly into ProblemDescriptors & use it to create LAZY refs in batch run.

Browse Source
This commit is contained in:
Alexey Gopachenko
2009-11-10 23:35:38 +03:00
parent 16d8aa04f8
commit ab3982079d
68 changed files with 420 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java
+3 -3
View File
@@ -76,7 +76,7 @@ public class LossyEncodingInspection extends BaseJavaLocalInspectionTool {
if (isRepresentable(c, charset)) {
if (start != -1) {
ProblemDescriptor descriptor = manager.createProblemDescriptor(file, new TextRange(start, i), InspectionsBundle.message(
"unsupported.character.for.the.charset", charset), ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
"unsupported.character.for.the.charset", charset), ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly);
descriptors.add(descriptor);
start = -1;
@@ -92,7 +92,7 @@ public class LossyEncodingInspection extends BaseJavaLocalInspectionTool {
}
if (start != -1) {
ProblemDescriptor descriptor = manager.createProblemDescriptor(file, new TextRange(start, text.length()), InspectionsBundle.message(
"unsupported.character.for.the.charset", charset), ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
"unsupported.character.for.the.charset", charset), ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly);
descriptors.add(descriptor);
}
@@ -105,4 +105,4 @@ public class LossyEncodingInspection extends BaseJavaLocalInspectionTool {
CharBuffer buffer = charset.decode(out);
return str.equals(buffer.toString());
}
}
}
java/java-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java
+2 -1
View File
@@ -229,7 +229,8 @@ public class RedundantSuppressInspection extends GlobalInspectionTool{
if (identifier == null) {
identifier = psiMember;
}
result.add(manager.createProblemDescriptor(identifier, description, (LocalQuickFix)fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
result.add(manager.createProblemDescriptor(identifier, description, (LocalQuickFix)fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
false));
}
}
}
java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java
+1 -1
View File
@@ -162,7 +162,7 @@ public class CanBeFinalInspection extends GlobalJavaInspectionTool {
if (psiIdentifier != null) {
return new ProblemDescriptor[]{manager.createProblemDescriptor(psiIdentifier, InspectionsBundle.message(
"inspection.export.results.can.be.final.description"), new AcceptSuggested(globalContext.getRefManager()),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING)};
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false)};
}
}
return null;
java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/CatchBodyVisitor.java
+5 -2
View File
@@ -40,11 +40,13 @@ class CatchBodyVisitor extends JavaRecursiveElementWalkingVisitor {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.defaultFileTemplateUsage.CatchBodyVisitor");
Collection<ProblemDescriptor> myProblemDescriptors;
private boolean myOnTheFly;
private final InspectionManager myManager;
public CatchBodyVisitor(InspectionManager manager, Collection<ProblemDescriptor> descriptors) {
public CatchBodyVisitor(InspectionManager manager, Collection<ProblemDescriptor> descriptors, boolean onTheFly) {
myManager = manager;
myProblemDescriptors = descriptors;
myOnTheFly = onTheFly;
}
@Override public void visitCatchSection(PsiCatchSection section) {
@@ -104,7 +106,8 @@ class CatchBodyVisitor extends JavaRecursiveElementWalkingVisitor {
}
Pair<? extends PsiElement, ? extends PsiElement> range = DefaultFileTemplateUsageInspection.getInteriorRange(catchBlock);
final String description = InspectionsBundle.message("default.file.template.description");
ProblemDescriptor descriptor = myManager.createProblemDescriptor(range.first, range.second, description, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, createQuickFix(section));
ProblemDescriptor descriptor = myManager.createProblemDescriptor(range.first, range.second, description, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
myOnTheFly, createQuickFix(section));
myProblemDescriptors.add(descriptor);
}
java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java
+4 -4
View File
@@ -59,10 +59,10 @@ public class DefaultFileTemplateUsageInspection extends BaseJavaLocalInspectionT
public ProblemDescriptor[] checkMethod(@NotNull PsiMethod method, @NotNull InspectionManager manager, boolean isOnTheFly) {
Collection<ProblemDescriptor> descriptors = new ArrayList<ProblemDescriptor>();
if (CHECK_METHOD_BODY) {
MethodBodyChecker.checkMethodBody(method, manager, descriptors);
MethodBodyChecker.checkMethodBody(method, manager, descriptors, isOnTheFly);
}
if (CHECK_TRY_CATCH_SECTION) {
CatchBodyVisitor visitor = new CatchBodyVisitor(manager, descriptors);
CatchBodyVisitor visitor = new CatchBodyVisitor(manager, descriptors, isOnTheFly);
PsiCodeBlock body = method.getBody();
if (body != null) {
body.accept(visitor);
@@ -94,7 +94,7 @@ public class DefaultFileTemplateUsageInspection extends BaseJavaLocalInspectionT
@Nullable
public ProblemDescriptor[] checkClass(@NotNull PsiClass aClass, @NotNull InspectionManager manager, boolean isOnTheFly) {
if (!CHECK_TRY_CATCH_SECTION) return null;
CatchBodyVisitor visitor = new CatchBodyVisitor(manager, new ArrayList<ProblemDescriptor>());
CatchBodyVisitor visitor = new CatchBodyVisitor(manager, new ArrayList<ProblemDescriptor>(), isOnTheFly);
PsiClassInitializer[] initializers = aClass.getInitializers();
for (PsiClassInitializer initializer : initializers) {
initializer.accept(visitor);
@@ -106,7 +106,7 @@ public class DefaultFileTemplateUsageInspection extends BaseJavaLocalInspectionT
@Nullable
public ProblemDescriptor[] checkFile(@NotNull PsiFile file, @NotNull InspectionManager manager, boolean isOnTheFly) {
if (!CHECK_FILE_HEADER) return null;
ProblemDescriptor descriptor = FileHeaderChecker.checkFileHeader(file, manager);
ProblemDescriptor descriptor = FileHeaderChecker.checkFileHeader(file, manager, isOnTheFly);
return descriptor == null ? null : new ProblemDescriptor[]{descriptor};
}
java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java
+2 -3
View File
@@ -49,8 +49,7 @@ import java.util.regex.Pattern;
public class FileHeaderChecker {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.defaultFileTemplateUsage.FileHeaderChecker");
static ProblemDescriptor checkFileHeader(final PsiFile file,
final InspectionManager manager) {
static ProblemDescriptor checkFileHeader(final PsiFile file, final InspectionManager manager, boolean onTheFly) {
FileTemplate template = FileTemplateManager.getInstance().getDefaultTemplate(FileTemplateManager.FILE_HEADER_TEMPLATE_NAME);
TIntObjectHashMap<String> offsetToProperty = new TIntObjectHashMap<String>();
String templateText = template.getText().trim();
@@ -78,7 +77,7 @@ public class FileHeaderChecker {
if (element == null) return null;
LocalQuickFix[] quickFix = createQuickFix(element, matcher, offsetToProperty);
final String description = InspectionsBundle.message("default.file.template.description");
return manager.createProblemDescriptor(element, description, quickFix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
return manager.createProblemDescriptor(element, description, quickFix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, onTheFly);
}
return null;
}
java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/MethodBodyChecker.java
+3 -3
View File
@@ -15,8 +15,8 @@
*/
package com.intellij.codeInspection.defaultFileTemplateUsage;
import com.intellij.codeInsight.PsiEquivalenceUtil;
import com.intellij.codeInsight.CodeInsightUtil;
import com.intellij.codeInsight.PsiEquivalenceUtil;
import com.intellij.codeInsight.daemon.impl.quickfix.CreateFromUsageUtils;
import com.intellij.codeInsight.generation.OverrideImplementUtil;
import com.intellij.codeInspection.*;
@@ -86,7 +86,7 @@ public class MethodBodyChecker {
static void checkMethodBody(final PsiMethod method,
final InspectionManager manager,
final Collection<ProblemDescriptor> problemDescriptors) {
final Collection<ProblemDescriptor> problemDescriptors, boolean onTheFly) {
PsiType returnType = method.getReturnType();
if (method.isConstructor() || returnType == null) return;
PsiCodeBlock body = method.getBody();
@@ -112,7 +112,7 @@ public class MethodBodyChecker {
Pair<? extends PsiElement, ? extends PsiElement> range = DefaultFileTemplateUsageInspection.getInteriorRange(body);
final String description = InspectionsBundle.message("default.file.template.description");
ProblemDescriptor problem = manager.createProblemDescriptor(range.first, range.second, description,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, onTheFly,
createMethodBodyQuickFix(method));
problemDescriptors.add(problem);
}
java/java-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java
+3 -2
View File
@@ -84,7 +84,7 @@ public class DependencyInspection extends BaseLocalInspectionTool {
}
@Nullable
public ProblemDescriptor[] checkFile(@NotNull final PsiFile file, @NotNull final InspectionManager manager, boolean isOnTheFly) {
public ProblemDescriptor[] checkFile(@NotNull final PsiFile file, @NotNull final InspectionManager manager, final boolean isOnTheFly) {
if (file == null) return null;
if (file.getViewProvider().getPsi(StdLanguages.JAVA) == null) return null;
final DependencyValidationManager validationManager = DependencyValidationManager.getInstance(file.getProject());
@@ -100,7 +100,8 @@ public class DependencyInspection extends BaseLocalInspectionTool {
for (DependencyRule dependencyRule : rule) {
StringBuffer message = new StringBuffer();
message.append(MessageFormat.format(InspectionsBundle.message("inspection.dependency.violator.problem.descriptor"), dependencyRule.getDisplayText()));
problems.add(manager.createProblemDescriptor(place, message.toString(), new LocalQuickFix[]{new EditDependencyRulesAction(dependencyRule)}, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
problems.add(manager.createProblemDescriptor(place, message.toString(), new LocalQuickFix[]{new EditDependencyRulesAction(dependencyRule)}, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly));
}
}
}
java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
+1 -1
View File
@@ -148,7 +148,7 @@ public class EmptyMethodInspection extends GlobalJavaInspectionTool {
final ProblemDescriptor descriptor = manager.createProblemDescriptor(refMethod.getElement().getNavigationElement(), message,
fixes.toArray(new LocalQuickFix[fixes.size()]),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false);
return new ProblemDescriptor[]{descriptor};
}
java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java
+72 -56
View File
@@ -269,12 +269,15 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
return new OptionsPanel();
}
private static ProblemDescriptor createDescriptor(@NotNull PsiElement element, String template, InspectionManager manager) {
return manager.createProblemDescriptor(element, template, (LocalQuickFix [])null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
private static ProblemDescriptor createDescriptor(@NotNull PsiElement element, String template, InspectionManager manager,
boolean onTheFly) {
return manager.createProblemDescriptor(element, template, (LocalQuickFix [])null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
onTheFly);
}
private static ProblemDescriptor createDescriptor(@NotNull PsiElement element, String template, @NotNull LocalQuickFix fix, InspectionManager manager) {
return manager.createProblemDescriptor(element, template, fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
private static ProblemDescriptor createDescriptor(@NotNull PsiElement element, String template, @NotNull LocalQuickFix fix,
InspectionManager manager, boolean onTheFly) {
return manager.createProblemDescriptor(element, template, fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, onTheFly);
}
private static class AddMissingTagFix implements LocalQuickFix {
@@ -356,7 +359,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
final PsiElement elementToHighlight = nameIdentifier != null ? nameIdentifier : psiClass;
if (docComment == null) {
return isJavaDocRequired(psiClass)
? new ProblemDescriptor[]{createDescriptor(elementToHighlight, REQUIRED_JAVADOC_IS_ABSENT, manager)}
? new ProblemDescriptor[]{createDescriptor(elementToHighlight, REQUIRED_JAVADOC_IS_ABSENT, manager, isOnTheFly)}
: null;
}
@@ -393,27 +396,27 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
for (int i = 0; i < tagsToCheck.length; i++) {
final String tagToCheck = tagsToCheck[i];
if (isTagRequired[i] && !isTagPresent[i]) {
problems.add(createMissingTagDescriptor(elementToHighlight, tagToCheck, manager));
problems.add(createMissingTagDescriptor(elementToHighlight, tagToCheck, manager, isOnTheFly));
}
}
ArrayList<ProblemDescriptor> tagProblems = getTagValuesProblems(psiClass, tags, manager);
ArrayList<ProblemDescriptor> tagProblems = getTagValuesProblems(psiClass, tags, manager, isOnTheFly);
if (tagProblems != null) {
problems.addAll(tagProblems);
}
checkForPeriodInDoc(docComment, problems, manager);
checkForPeriodInDoc(docComment, problems, manager, isOnTheFly);
checkInlineTags(manager, problems, docComment.getDescriptionElements(),
JavaPsiFacade.getInstance(docComment.getProject()).getJavadocManager());
JavaPsiFacade.getInstance(docComment.getProject()).getJavadocManager(), isOnTheFly);
for (PsiDocTag tag : tags) {
for (int i = 0; i < tagsToCheck.length; i++) {
final String tagToCheck = tagsToCheck[i];
if (tagToCheck.equals(tag.getName()) && extractTagDescription(tag).length() == 0) {
problems.add(createDescriptor(elementToHighlight, InspectionsBundle.message(absentDescriptionKeys[i]), manager));
problems.add(createDescriptor(elementToHighlight, InspectionsBundle.message(absentDescriptionKeys[i]), manager, isOnTheFly));
}
}
}
checkDuplicateTags(tags, problems, manager);
checkDuplicateTags(tags, problems, manager, isOnTheFly);
if (isTagRequired(psiClass, "param") && psiClass.hasTypeParameters() && nameIdentifier != null) {
ArrayList<PsiTypeParameter> absentParameters = null;
@@ -426,7 +429,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
}
if (absentParameters != null) {
for (PsiTypeParameter psiTypeParameter : absentParameters) {
problems.add(createMissingParamTagDescriptor(nameIdentifier, psiTypeParameter, manager));
problems.add(createMissingParamTagDescriptor(nameIdentifier, psiTypeParameter, manager, isOnTheFly));
}
}
}
@@ -438,9 +441,10 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
private static ProblemDescriptor createMissingParamTagDescriptor(final PsiIdentifier nameIdentifier,
final PsiTypeParameter psiTypeParameter,
final InspectionManager manager) {
final InspectionManager manager, boolean isOnTheFly) {
String message = InspectionsBundle.message("inspection.javadoc.problem.missing.tag", "<code>@param</code>");
return createDescriptor(nameIdentifier, message, new AddMissingTagFix("param", "<" + psiTypeParameter.getName() + ">"), manager);
return createDescriptor(nameIdentifier, message, new AddMissingTagFix("param", "<" + psiTypeParameter.getName() + ">"), manager,
isOnTheFly);
}
@Nullable
@@ -452,19 +456,19 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
PsiDocComment docComment = psiField.getDocComment();
if (docComment == null) {
return isJavaDocRequired(psiField)
? new ProblemDescriptor[]{createDescriptor(psiField.getNameIdentifier(), REQUIRED_JAVADOC_IS_ABSENT, manager)}
? new ProblemDescriptor[]{createDescriptor(psiField.getNameIdentifier(), REQUIRED_JAVADOC_IS_ABSENT, manager, isOnTheFly)}
: null;
}
final ArrayList<ProblemDescriptor> problems = new ArrayList<ProblemDescriptor>(2);
ArrayList<ProblemDescriptor> tagProblems = getTagValuesProblems(psiField, docComment.getTags(), manager);
ArrayList<ProblemDescriptor> tagProblems = getTagValuesProblems(psiField, docComment.getTags(), manager, isOnTheFly);
if (tagProblems != null) {
problems.addAll(tagProblems);
}
checkInlineTags(manager, problems, docComment.getDescriptionElements(),
JavaPsiFacade.getInstance(docComment.getProject()).getJavadocManager());
checkForPeriodInDoc(docComment, problems, manager);
checkDuplicateTags(docComment.getTags(), problems, manager);
JavaPsiFacade.getInstance(docComment.getProject()).getJavadocManager(), isOnTheFly);
checkForPeriodInDoc(docComment, problems, manager, isOnTheFly);
checkDuplicateTags(docComment.getTags(), problems, manager, isOnTheFly);
return problems.isEmpty()
? null
: problems.toArray(new ProblemDescriptor[problems.size()]);
@@ -488,7 +492,8 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
}
if (superMethods.length == 0) {
final PsiIdentifier nameIdentifier = psiMethod.getNameIdentifier();
return nameIdentifier != null ? new ProblemDescriptor[] { createDescriptor(nameIdentifier, REQUIRED_JAVADOC_IS_ABSENT, manager)} : null;
return nameIdentifier != null ? new ProblemDescriptor[] { createDescriptor(nameIdentifier, REQUIRED_JAVADOC_IS_ABSENT, manager,
isOnTheFly)} : null;
}
else {
return null;
@@ -509,7 +514,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
final ArrayList<ProblemDescriptor> problems = new ArrayList<ProblemDescriptor>(2);
checkInlineTags(manager, problems, descriptionElements,
JavaPsiFacade.getInstance(docComment.getProject()).getJavadocManager());
JavaPsiFacade.getInstance(docComment.getProject()).getJavadocManager(), isOnTheFly);
final PsiDocTag tagByName = docComment.findTagByName("inheritDoc");
if (tagByName != null) {
@@ -550,7 +555,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
if (isReturnRequired && isReturnAbsent) {
final PsiIdentifier psiIdentifier = psiMethod.getNameIdentifier();
if (psiIdentifier != null) {
problems.add(createMissingTagDescriptor(psiIdentifier, "return", manager));
problems.add(createMissingTagDescriptor(psiIdentifier, "return", manager, isOnTheFly));
}
}
@@ -558,7 +563,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
for (PsiParameter psiParameter : absentParameters) {
final PsiIdentifier nameIdentifier = psiMethod.getNameIdentifier();
if (nameIdentifier != null) {
problems.add(createMissingParamTagDescriptor(nameIdentifier, psiParameter, manager));
problems.add(createMissingParamTagDescriptor(nameIdentifier, psiParameter, manager, isOnTheFly));
}
}
}
@@ -581,7 +586,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
if (valueElement != null) {
problems.add(createDescriptor(valueElement,
InspectionsBundle.message("inspection.javadoc.method.problem.missing.tag.description", "<code>@param " + valueElement.getText() + "</code>"),
manager));
manager, isOnTheFly));
}
}
@@ -597,20 +602,20 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
declaredExceptions.put(classType, psiClass);
}
}
processThrowsTags(tags, declaredExceptions, manager, problems);
processThrowsTags(tags, declaredExceptions, manager, problems, isOnTheFly);
if (!declaredExceptions.isEmpty()) {
for (PsiClassType declaredException : declaredExceptions.keySet()) {
problems.add(createMissingThrowsTagDescriptor(psiMethod, manager, declaredException));
problems.add(createMissingThrowsTagDescriptor(psiMethod, manager, declaredException, isOnTheFly));
}
}
}
ArrayList<ProblemDescriptor> tagProblems = getTagValuesProblems(psiMethod, tags, manager);
ArrayList<ProblemDescriptor> tagProblems = getTagValuesProblems(psiMethod, tags, manager, isOnTheFly);
if (tagProblems != null) {
problems.addAll(tagProblems);
}
checkForPeriodInDoc(docComment, problems, manager);
checkForPeriodInDoc(docComment, problems, manager, isOnTheFly);
for (PsiDocTag tag : tags) {
if ("param".equals(tag.getName())) {
@@ -623,7 +628,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
if (paramRef.getReference().isReferenceTo(param)) {
problems.add(createDescriptor(value,
InspectionsBundle.message("inspection.javadoc.method.problem.descriptor", "<code>@param</code>", "<code>" + param.getName() + "</code>"),
manager));
manager, isOnTheFly));
}
}
}
@@ -633,13 +638,14 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
if ("return".equals(tag.getName())) {
if (extractTagDescription(tag).length() == 0) {
String message = InspectionsBundle.message("inspection.javadoc.method.problem.missing.tag.description", "<code>@return</code>");
ProblemDescriptor descriptor = manager.createProblemDescriptor(tag.getNameElement(), message, null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, true);
ProblemDescriptor descriptor = manager.createProblemDescriptor(tag.getNameElement(), message, null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly, true);
problems.add(descriptor);
}
}
}
checkDuplicateTags(tags, problems, manager);
checkDuplicateTags(tags, problems, manager, isOnTheFly);
return problems.isEmpty()
? null
@@ -665,7 +671,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
private static void processThrowsTags(final PsiDocTag[] tags,
final Map<PsiClassType, PsiClass> declaredExceptions,
final InspectionManager mananger,
@NotNull final ArrayList<ProblemDescriptor> problems) {
@NotNull final ArrayList<ProblemDescriptor> problems, boolean isOnTheFly) {
for (PsiDocTag tag : tags) {
if ("throws".equals(tag.getName()) || "exception".equals(tag.getName())) {
final PsiDocTagValue value = tag.getValueElement();
@@ -683,7 +689,8 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
final PsiClass psiClass = declaredExceptions.get(classType);
if (InheritanceUtil.isInheritorOrSelf(exceptionClass, psiClass, true)) {
if (extractThrowsTagDescription(tag).length() == 0) {
problems.add(createDescriptor(tag.getNameElement(), InspectionsBundle.message("inspection.javadoc.method.problem.missing.tag.description", "<code>" + tag.getName() + "</code>"), mananger));
problems.add(createDescriptor(tag.getNameElement(), InspectionsBundle.message("inspection.javadoc.method.problem.missing.tag.description", "<code>" + tag.getName() + "</code>"), mananger,
isOnTheFly));
}
it.remove();
}
@@ -696,25 +703,26 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
@Nullable
private static ProblemDescriptor createMissingThrowsTagDescriptor(final PsiMethod method,
final InspectionManager manager,
final PsiClassType exceptionClassType) {
final PsiClassType exceptionClassType, boolean isOnTheFly) {
@NonNls String tag = "throws";
String message = InspectionsBundle.message("inspection.javadoc.problem.missing.tag", "<code>@" + tag + "</code> " + exceptionClassType.getCanonicalText());
final String firstDeclaredException = exceptionClassType.getCanonicalText();
final PsiIdentifier nameIdentifier = method.getNameIdentifier();
return nameIdentifier != null ? createDescriptor(nameIdentifier, message,new AddMissingTagFix(tag, firstDeclaredException), manager) : null;
return nameIdentifier != null ? createDescriptor(nameIdentifier, message,new AddMissingTagFix(tag, firstDeclaredException), manager,
isOnTheFly) : null;
}
private static ProblemDescriptor createMissingTagDescriptor(PsiElement elementToHighlight,
@NonNls String tag,
final InspectionManager manager) {
final InspectionManager manager, boolean isOnTheFly) {
String message = InspectionsBundle.message("inspection.javadoc.problem.missing.tag", "<code>@" + tag + "</code>");
return createDescriptor(elementToHighlight, message,new AddMissingTagFix(tag), manager);
return createDescriptor(elementToHighlight, message,new AddMissingTagFix(tag), manager, isOnTheFly);
}
private static ProblemDescriptor createMissingParamTagDescriptor(PsiElement elementToHighlight,
PsiParameter param,
final InspectionManager manager) {
final InspectionManager manager, boolean isOnTheFly) {
String message = InspectionsBundle.message("inspection.javadoc.method.problem.missing.param.tag", "<code>@param</code>", "<code>" + param.getName() + "</code>");
return createDescriptor(elementToHighlight, message, new AddMissingParamTagFix(param), manager);
return createDescriptor(elementToHighlight, message, new AddMissingParamTagFix(param), manager, isOnTheFly);
}
private static class AddMissingParamTagFix extends AddMissingTagFix {
@@ -809,7 +817,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
private void checkForPeriodInDoc(PsiDocComment docComment,
ArrayList<ProblemDescriptor> problems,
InspectionManager manager) {
InspectionManager manager, boolean onTheFly) {
if (IGNORE_JAVADOC_PERIOD) return;
PsiDocTag[] tags = docComment.getTags();
int dotIndex = docComment.getText().indexOf('.');
@@ -830,13 +838,13 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
problems.add(manager.createProblemDescriptor(docComment.getFirstChild(),
InspectionsBundle.message("inspection.javadoc.problem.descriptor1"),
null,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
false));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, onTheFly, false));
}
}
@Nullable
private ArrayList<ProblemDescriptor> getTagValuesProblems(PsiDocCommentOwner context, PsiDocTag[] tags, InspectionManager inspectionManager) {
private ArrayList<ProblemDescriptor> getTagValuesProblems(PsiDocCommentOwner context, PsiDocTag[] tags, InspectionManager inspectionManager,
boolean isOnTheFly) {
final ArrayList<ProblemDescriptor> problems = new ArrayList<ProblemDescriptor>(2);
nextTag:
for (PsiDocTag tag : tags) {
@@ -851,9 +859,11 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
}
if (tagInfo == null){
problems.add(createDescriptor(tag.getNameElement(), InspectionsBundle.message("inspection.javadoc.problem.wrong.tag", "<code>" + tagName + "</code>"), new AddUnknownTagToCustoms(tag), inspectionManager));
problems.add(createDescriptor(tag.getNameElement(), InspectionsBundle.message("inspection.javadoc.problem.wrong.tag", "<code>" + tagName + "</code>"), new AddUnknownTagToCustoms(tag), inspectionManager,
isOnTheFly));
} else {
problems.add(createDescriptor(tag.getNameElement(), InspectionsBundle.message("inspection.javadoc.problem.disallowed.tag", "<code>" + tagName + "</code>"), new AddUnknownTagToCustoms(tag), inspectionManager));
problems.add(createDescriptor(tag.getNameElement(), InspectionsBundle.message("inspection.javadoc.problem.disallowed.tag", "<code>" + tagName + "</code>"), new AddUnknownTagToCustoms(tag), inspectionManager,
isOnTheFly));
}
}
@@ -870,7 +880,8 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
final int textOffset = value.getTextOffset();
if (textOffset == value.getTextRange().getEndOffset()) {
problems.add(inspectionManager.createProblemDescriptor(tag, InspectionsBundle.message("inspection.javadoc.problem.name.expected"), null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, true));
problems.add(inspectionManager.createProblemDescriptor(tag, InspectionsBundle.message("inspection.javadoc.problem.name.expected"), null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly, true));
}
}
}
@@ -878,12 +889,13 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
if (message != null) {
final PsiDocTagValue valueElement = tag.getValueElement();
if (valueElement == null){
problems.add(inspectionManager.createProblemDescriptor(tag, InspectionsBundle.message("inspection.javadoc.method.problem.missing.tag.description", "<code>" + tag.getName() + "</code>"), null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, true));
problems.add(inspectionManager.createProblemDescriptor(tag, InspectionsBundle.message("inspection.javadoc.method.problem.missing.tag.description", "<code>" + tag.getName() + "</code>"), null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly, true));
} else {
problems.add(createDescriptor(valueElement, message, inspectionManager));
problems.add(createDescriptor(valueElement, message, inspectionManager, isOnTheFly));
}
}
checkInlineTags(inspectionManager, problems, tag.getDataElements(), manager);
checkInlineTags(inspectionManager, problems, tag.getDataElements(), manager, isOnTheFly);
}
return problems.isEmpty() ? null : problems;
@@ -892,14 +904,15 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
private void checkInlineTags(final InspectionManager inspectionManager,
final ArrayList<ProblemDescriptor> problems,
final PsiElement[] dataElements,
final JavadocManager manager) {
final JavadocManager manager, boolean isOnTheFly) {
for (PsiElement dataElement : dataElements) {
if (dataElement instanceof PsiInlineDocTag) {
final PsiInlineDocTag inlineDocTag = (PsiInlineDocTag)dataElement;
final PsiElement nameElement = inlineDocTag.getNameElement();
if (manager.getTagInfo(inlineDocTag.getName()) == null) {
if (nameElement != null) {
problems.add(createDescriptor(nameElement, InspectionsBundle.message("inspection.javadoc.problem.wrong.tag", "<code>" + inlineDocTag.getName() + "</code>"), new AddUnknownTagToCustoms(inlineDocTag), inspectionManager));
problems.add(createDescriptor(nameElement, InspectionsBundle.message("inspection.javadoc.problem.wrong.tag", "<code>" + inlineDocTag.getName() + "</code>"), new AddUnknownTagToCustoms(inlineDocTag), inspectionManager,
isOnTheFly));
}
}
final PsiDocTagValue value = inlineDocTag.getValueElement();
@@ -910,7 +923,8 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
if (ref != null){
if (PsiTreeUtil.getParentOfType(inlineDocTag, PsiDocCommentOwner.class) == PsiTreeUtil.getParentOfType(ref, PsiDocCommentOwner.class, false)) {
if (nameElement != null) {
problems.add(createDescriptor(nameElement, InspectionsBundle.message("inspection.javadoc.problem.pointing.to.itself"), inspectionManager));
problems.add(createDescriptor(nameElement, InspectionsBundle.message("inspection.javadoc.problem.pointing.to.itself"), inspectionManager,
isOnTheFly));
}
}
}
@@ -982,7 +996,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
private static void checkDuplicateTags(final PsiDocTag[] tags,
ArrayList<ProblemDescriptor> problems,
final InspectionManager manager) {
final InspectionManager manager, boolean isOnTheFly) {
Set<String> documentedParamNames = null;
Set<String> documentedExceptions = null;
Set<String> uniqueTags = null;
@@ -998,7 +1012,8 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
documentedParamNames = new HashSet<String>();
}
if (documentedParamNames.contains(paramName)) {
problems.add(createDescriptor(tag.getNameElement(), InspectionsBundle.message("inspection.javadoc.problem.duplicate.param", paramName), manager));
problems.add(createDescriptor(tag.getNameElement(), InspectionsBundle.message("inspection.javadoc.problem.duplicate.param", paramName), manager,
isOnTheFly));
}
documentedParamNames.add(paramName);
}
@@ -1020,7 +1035,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
if (documentedExceptions.contains(fqName)) {
problems.add(createDescriptor(tag.getNameElement(),
InspectionsBundle.message("inspection.javadoc.problem.duplicate.throws", fqName),
manager));
manager, isOnTheFly));
}
documentedExceptions.add(fqName);
}
@@ -1033,7 +1048,8 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool {
uniqueTags = new HashSet<String>();
}
if (uniqueTags.contains(tag.getName())) {
problems.add(createDescriptor(tag.getNameElement(), InspectionsBundle.message("inspection.javadoc.problem.duplicate.tag", tag.getName()), manager));
problems.add(createDescriptor(tag.getNameElement(), InspectionsBundle.message("inspection.javadoc.problem.duplicate.tag", tag.getName()), manager,
isOnTheFly));
}
uniqueTags.add(tag.getName());
}
java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
+15 -14
View File
@@ -43,8 +43,9 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
public static final String DISPLAY_NAME = InspectionsBundle.message("inspection.javadoc.ref.display.name");
private static ProblemDescriptor createDescriptor(@NotNull PsiElement element, String template, InspectionManager manager) {
return manager.createProblemDescriptor(element, template, (LocalQuickFix [])null, ProblemHighlightType.LIKE_UNKNOWN_SYMBOL);
private static ProblemDescriptor createDescriptor(@NotNull PsiElement element, String template, InspectionManager manager,
boolean onTheFly) {
return manager.createProblemDescriptor(element, template, (LocalQuickFix [])null, ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, onTheFly);
}
@Nullable
@@ -64,12 +65,13 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
if (docComment == null) return null;
final Set<PsiJavaCodeReferenceElement> references = new HashSet<PsiJavaCodeReferenceElement>();
docComment.accept(getVisitor(references, docCommentOwner, problems, manager));
docComment.accept(getVisitor(references, docCommentOwner, problems, manager, isOnTheFly));
for (PsiJavaCodeReferenceElement reference : references) {
final List<PsiClass> classesToImport = new ImportClassFix(reference).getClassesToImport();
problems.add(manager.createProblemDescriptor(reference, InspectionsBundle.message("inspection.javadoc.problem.cannot.resolve",
"<code>" + reference.getText() + "</code>"),
!isOnTheFly || classesToImport.isEmpty() ? null : new AddImportFix(classesToImport), ProblemHighlightType.LIKE_UNKNOWN_SYMBOL));
!isOnTheFly || classesToImport.isEmpty() ? null : new AddImportFix(classesToImport), ProblemHighlightType.LIKE_UNKNOWN_SYMBOL,
isOnTheFly));
}
return problems.isEmpty()
@@ -86,7 +88,7 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
private PsiElementVisitor getVisitor(final Set<PsiJavaCodeReferenceElement> references,
final PsiElement context,
final ArrayList<ProblemDescriptor> problems,
final InspectionManager manager) {
final InspectionManager manager, final boolean onTheFly) {
return new JavaElementVisitor() {
@Override public void visitReferenceExpression(PsiReferenceExpression expression) {
visitElement(expression);
@@ -105,14 +107,14 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
final JavadocManager javadocManager = JavaPsiFacade.getInstance(tag.getProject()).getJavadocManager();
final JavadocTagInfo info = javadocManager.getTagInfo(tag.getName());
if (info == null || !info.isInline()) {
visitRefInDocTag(tag, javadocManager, context, problems, manager);
visitRefInDocTag(tag, javadocManager, context, problems, manager, onTheFly);
}
}
@Override public void visitInlineDocTag(PsiInlineDocTag tag) {
super.visitInlineDocTag(tag);
final JavadocManager javadocManager = JavaPsiFacade.getInstance(tag.getProject()).getJavadocManager();
visitRefInDocTag(tag, javadocManager, context, problems, manager);
visitRefInDocTag(tag, javadocManager, context, problems, manager, onTheFly);
}
@Override public void visitElement(PsiElement element) {
@@ -127,11 +129,9 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
};
}
public static void visitRefInDocTag(final PsiDocTag tag,
final JavadocManager manager,
final PsiElement context,
ArrayList<ProblemDescriptor> problems,
InspectionManager inspectionManager) {
public static void visitRefInDocTag(final PsiDocTag tag, final JavadocManager manager, final PsiElement context, ArrayList<ProblemDescriptor> problems,
InspectionManager inspectionManager,
boolean onTheFly) {
String tagName = tag.getName();
PsiDocTagValue value = tag.getValueElement();
if (value == null) return;
@@ -139,7 +139,7 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
if (info != null && !info.isValidInContext(context)) return;
String message = info == null || !info.isInline() ? null : info.checkTagValue(value);
if (message != null){
problems.add(createDescriptor(value, message, inspectionManager));
problems.add(createDescriptor(value, message, inspectionManager, onTheFly));
}
final PsiReference reference = value.getReference();
if (reference != null) {
@@ -151,7 +151,8 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
final PsiDocTagValue valueElement = tag.getValueElement();
if (valueElement != null) {
@NonNls String params = "<code>" + value.getContainingFile().getViewProvider().getContents().subSequence(textOffset, value.getTextRange().getEndOffset()) + "</code>";
problems.add(createDescriptor(valueElement, InspectionsBundle.message("inspection.javadoc.problem.cannot.resolve", params), inspectionManager));
problems.add(createDescriptor(valueElement, InspectionsBundle.message("inspection.javadoc.problem.cannot.resolve", params), inspectionManager,
onTheFly));
}
}
}
java/java-impl/src/com/intellij/codeInspection/localCanBeFinal/LocalCanBeFinal.java
+9 -7
View File
@@ -24,8 +24,8 @@ import com.intellij.openapi.vfs.ReadonlyStatusHandler;
import com.intellij.psi.*;
import com.intellij.psi.controlFlow.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtilBase;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.PsiUtilBase;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -35,7 +35,9 @@ import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.util.*;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
/**
@@ -55,7 +57,7 @@ public class LocalCanBeFinal extends BaseLocalInspectionTool {
}
public ProblemDescriptor[] checkMethod(@NotNull PsiMethod method, @NotNull InspectionManager manager, boolean isOnTheFly) {
List<ProblemDescriptor> list = checkCodeBlock(method.getBody(), manager);
List<ProblemDescriptor> list = checkCodeBlock(method.getBody(), manager, isOnTheFly);
return list == null ? null : list.toArray(new ProblemDescriptor[list.size()]);
}
@@ -63,7 +65,7 @@ public class LocalCanBeFinal extends BaseLocalInspectionTool {
List<ProblemDescriptor> allProblems = null;
final PsiClassInitializer[] initializers = aClass.getInitializers();
for (PsiClassInitializer initializer : initializers) {
final List<ProblemDescriptor> problems = checkCodeBlock(initializer.getBody(), manager);
final List<ProblemDescriptor> problems = checkCodeBlock(initializer.getBody(), manager, isOnTheFly);
if (problems != null) {
if (allProblems == null) {
allProblems = new ArrayList<ProblemDescriptor>(1);
@@ -75,7 +77,7 @@ public class LocalCanBeFinal extends BaseLocalInspectionTool {
}
@Nullable
private List<ProblemDescriptor> checkCodeBlock(final PsiCodeBlock body, InspectionManager manager) {
private List<ProblemDescriptor> checkCodeBlock(final PsiCodeBlock body, InspectionManager manager, boolean onTheFly) {
if (body == null) return null;
final ControlFlow flow;
try {
@@ -216,12 +218,12 @@ public class LocalCanBeFinal extends BaseLocalInspectionTool {
if (variable instanceof PsiParameter && !(((PsiParameter)variable).getDeclarationScope() instanceof PsiForeachStatement)) {
problems.add(manager.createProblemDescriptor(problemElement,
InspectionsBundle.message("inspection.can.be.local.parameter.problem.descriptor"),
myQuickFix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
myQuickFix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, onTheFly));
}
else {
problems.add(manager.createProblemDescriptor(problemElement,
InspectionsBundle.message("inspection.can.be.local.variable.problem.descriptor"),
myQuickFix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
myQuickFix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, onTheFly));
}
}
java/java-impl/src/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java
+4 -4
View File
@@ -34,7 +34,7 @@ public abstract class GenericsInspectionToolBase extends BaseLocalInspectionTool
if (initializers.length == 0) return null;
List<ProblemDescriptor> descriptors = new ArrayList<ProblemDescriptor>();
for (PsiClassInitializer initializer : initializers) {
final ProblemDescriptor[] localDescriptions = getDescriptions(initializer, manager);
final ProblemDescriptor[] localDescriptions = getDescriptions(initializer, manager, isOnTheFly);
if (localDescriptions != null) {
descriptors.addAll(Arrays.asList(localDescriptions));
}
@@ -46,7 +46,7 @@ public abstract class GenericsInspectionToolBase extends BaseLocalInspectionTool
public ProblemDescriptor[] checkField(@NotNull PsiField field, @NotNull InspectionManager manager, boolean isOnTheFly) {
final PsiExpression initializer = field.getInitializer();
if (initializer != null) {
return getDescriptions(initializer, manager);
return getDescriptions(initializer, manager, isOnTheFly);
}
return null;
}
@@ -54,10 +54,10 @@ public abstract class GenericsInspectionToolBase extends BaseLocalInspectionTool
public ProblemDescriptor[] checkMethod(@NotNull PsiMethod psiMethod, @NotNull InspectionManager manager, boolean isOnTheFly) {
final PsiCodeBlock body = psiMethod.getBody();
if (body != null) {
return getDescriptions(body, manager);
return getDescriptions(body, manager, isOnTheFly);
}
return null;
}
public abstract ProblemDescriptor[] getDescriptions(PsiElement place, InspectionManager manager);
public abstract ProblemDescriptor[] getDescriptions(PsiElement place, InspectionManager manager, boolean isOnTheFly);
}
java/java-impl/src/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java
+3 -2
View File
@@ -57,7 +57,7 @@ public class RedundantArrayForVarargsCallInspection extends GenericsInspectionTo
}
}
public ProblemDescriptor[] getDescriptions(PsiElement place, final InspectionManager manager) {
public ProblemDescriptor[] getDescriptions(PsiElement place, final InspectionManager manager, final boolean isOnTheFly) {
if (!PsiUtil.isLanguageLevel5OrHigher(place)) return null;
final List<ProblemDescriptor> problems = new ArrayList<ProblemDescriptor>();
place.accept(new JavaRecursiveElementWalkingVisitor() {
@@ -98,7 +98,8 @@ public class RedundantArrayForVarargsCallInspection extends GenericsInspectionTo
final ProblemDescriptor descriptor = manager.createProblemDescriptor(lastArg,
InspectionsBundle.message("inspection.redundant.array.creation.for.varargs.call.descriptor"),
myQuickFixAction,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly);
problems.add(descriptor);
}
java/java-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java
+3 -3
View File
@@ -58,12 +58,12 @@ public class RedundantTypeArgsInspection extends GenericsInspectionToolBase {
public ProblemDescriptor[] checkMethod(@NotNull PsiMethod psiMethod, @NotNull InspectionManager manager, boolean isOnTheFly) {
final PsiCodeBlock body = psiMethod.getBody();
if (body != null) {
return getDescriptions(body, manager);
return getDescriptions(body, manager, isOnTheFly);
}
return null;
}
public ProblemDescriptor[] getDescriptions(PsiElement place, final InspectionManager inspectionManager) {
public ProblemDescriptor[] getDescriptions(PsiElement place, final InspectionManager inspectionManager, boolean isOnTheFly) {
final List<ProblemDescriptor> problems = new ArrayList<ProblemDescriptor>();
place.accept(new JavaRecursiveElementWalkingVisitor() {
@Override public void visitMethodCallExpression(PsiMethodCallExpression expression) {
@@ -120,7 +120,7 @@ public class RedundantTypeArgsInspection extends GenericsInspectionToolBase {
final ProblemDescriptor descriptor = inspectionManager.createProblemDescriptor(expression.getTypeArgumentList(),
InspectionsBundle.message("inspection.redundant.type.problem.descriptor"),
myQuickFixAction,
ProblemHighlightType.LIKE_UNUSED_SYMBOL);
ProblemHighlightType.LIKE_UNUSED_SYMBOL, false);
problems.add(descriptor);
}
}
java/java-impl/src/com/intellij/codeInspection/redundantCast/RedundantCastInspection.java
+4 -4
View File
@@ -52,20 +52,20 @@ public class RedundantCastInspection extends GenericsInspectionToolBase {
myQuickFixAction = new AcceptSuggested();
}
public ProblemDescriptor[] getDescriptions(PsiElement where, InspectionManager manager) {
public ProblemDescriptor[] getDescriptions(PsiElement where, InspectionManager manager, boolean isOnTheFly) {
List<PsiTypeCastExpression> redundantCasts = RedundantCastUtil.getRedundantCastsInside(where);
if (redundantCasts.isEmpty()) return null;
ProblemDescriptor[] descriptions = new ProblemDescriptor[redundantCasts.size()];
for (int i = 0; i < redundantCasts.size(); i++) {
descriptions[i] = createDescription(redundantCasts.get(i), manager);
descriptions[i] = createDescription(redundantCasts.get(i), manager, isOnTheFly);
}
return descriptions;
}
private ProblemDescriptor createDescription(PsiTypeCastExpression cast, InspectionManager manager) {
private ProblemDescriptor createDescription(PsiTypeCastExpression cast, InspectionManager manager, boolean onTheFly) {
String message = InspectionsBundle.message("inspection.redundant.cast.problem.descriptor",
"<code>" + cast.getOperand().getText() + "</code>", "<code>#ref</code> #loc");
return manager.createProblemDescriptor(cast.getCastType(), message, myQuickFixAction, ProblemHighlightType.LIKE_UNUSED_SYMBOL);
return manager.createProblemDescriptor(cast.getCastType(), message, myQuickFixAction, ProblemHighlightType.LIKE_UNUSED_SYMBOL, onTheFly);
}
java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class SameParameterValueInspection extends GlobalJavaInspectionTool {
problems.add(manager.createProblemDescriptor(refParameter.getElement(), InspectionsBundle.message(
"inspection.same.parameter.problem.descriptor", "<code>" + paramName + "</code>", "<code>" + value + "</code>"),
new InlineParameterValueFix(paramName, value),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false));
}
}
}
java/java-impl/src/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java
+2 -1
View File
@@ -47,7 +47,8 @@ public class SameReturnValueInspection extends GlobalJavaInspectionTool {
message = InspectionsBundle.message("inspection.same.return.value.problem.descriptor2", "<code>" + returnValue + "</code>");
}
return new ProblemDescriptor[] {manager.createProblemDescriptor(refMethod.getElement().getNavigationElement(), message, (LocalQuickFix [])null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING)};
return new ProblemDescriptor[] {manager.createProblemDescriptor(refMethod.getElement().getNavigationElement(), message, (LocalQuickFix [])null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
false)};
}
}
java/java-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java
+6 -3
View File
@@ -86,15 +86,18 @@ public class RedundantThrows extends GlobalJavaInspectionTool {
if (refMethod.isAbstract() || refMethod.getOwnerClass().isInterface()) {
problems.add(manager.createProblemDescriptor(throwsRef, InspectionsBundle.message(
"inspection.redundant.throws.problem.descriptor", "<code>#ref</code>"), getFix(processor, throwsClassName), ProblemHighlightType.LIKE_UNUSED_SYMBOL));
"inspection.redundant.throws.problem.descriptor", "<code>#ref</code>"), getFix(processor, throwsClassName), ProblemHighlightType.LIKE_UNUSED_SYMBOL,
false));
}
else if (!refMethod.getDerivedMethods().isEmpty()) {
problems.add(manager.createProblemDescriptor(throwsRef, InspectionsBundle.message(
"inspection.redundant.throws.problem.descriptor1", "<code>#ref</code>"), getFix(processor, throwsClassName), ProblemHighlightType.LIKE_UNUSED_SYMBOL));
"inspection.redundant.throws.problem.descriptor1", "<code>#ref</code>"), getFix(processor, throwsClassName), ProblemHighlightType.LIKE_UNUSED_SYMBOL,
false));
}
else {
problems.add(manager.createProblemDescriptor(throwsRef, InspectionsBundle.message(
"inspection.redundant.throws.problem.descriptor2", "<code>#ref</code>"), getFix(processor, throwsClassName), ProblemHighlightType.LIKE_UNUSED_SYMBOL));
"inspection.redundant.throws.problem.descriptor2", "<code>#ref</code>"), getFix(processor, throwsClassName), ProblemHighlightType.LIKE_UNUSED_SYMBOL,
false));
}
}
}
java/java-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrowsDeclaration.java
+6 -4
View File
@@ -52,11 +52,11 @@ public class RedundantThrowsDeclaration extends BaseJavaLocalInspectionTool {
}
@Nullable
public ProblemDescriptor[] checkFile(@NotNull PsiFile file, @NotNull final InspectionManager manager, boolean isOnTheFly) {
public ProblemDescriptor[] checkFile(@NotNull PsiFile file, @NotNull final InspectionManager manager, final boolean isOnTheFly) {
final Set<ProblemDescriptor> problems = new HashSet<ProblemDescriptor>();
file.accept(new JavaRecursiveElementWalkingVisitor() {
@Override public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
final ProblemDescriptor descriptor = checkExceptionsNeverThrown(reference, manager);
final ProblemDescriptor descriptor = checkExceptionsNeverThrown(reference, manager, isOnTheFly);
if (descriptor != null) {
problems.add(descriptor);
}
@@ -69,7 +69,8 @@ public class RedundantThrowsDeclaration extends BaseJavaLocalInspectionTool {
//@top
private static ProblemDescriptor checkExceptionsNeverThrown(PsiJavaCodeReferenceElement referenceElement, InspectionManager inspectionManager) {
private static ProblemDescriptor checkExceptionsNeverThrown(PsiJavaCodeReferenceElement referenceElement, InspectionManager inspectionManager,
boolean onTheFly) {
if (!(referenceElement.getParent() instanceof PsiReferenceList)) return null;
PsiReferenceList referenceList = (PsiReferenceList)referenceElement.getParent();
if (!(referenceList.getParent() instanceof PsiMethod)) return null;
@@ -121,7 +122,8 @@ public class RedundantThrowsDeclaration extends BaseJavaLocalInspectionTool {
String description = JavaErrorMessages.message("exception.is.never.thrown", HighlightUtil.formatType(exceptionType));
final LocalQuickFix quickFixes = new DeleteThrowsFix(method, exceptionType);
return inspectionManager.createProblemDescriptor(referenceElement, description, quickFixes, ProblemHighlightType.LIKE_UNUSED_SYMBOL);
return inspectionManager.createProblemDescriptor(referenceElement, description, quickFixes, ProblemHighlightType.LIKE_UNUSED_SYMBOL,
onTheFly);
}
}
java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class UnusedParametersInspection extends GlobalJavaInspectionTool {
? InspectionsBundle.message("inspection.unused.parameter.composer")
: InspectionsBundle.message("inspection.unused.parameter.composer1"),
new AcceptSuggested(globalContext.getRefManager(), processor, refParameter.toString()),
ProblemHighlightType.LIKE_UNUSED_SYMBOL));
ProblemHighlightType.LIKE_UNUSED_SYMBOL, false));
}
}
return result.toArray(new CommonProblemDescriptor[result.size()]);
java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
+2 -1
View File
@@ -55,7 +55,8 @@ public class UnusedReturnValue extends GlobalJavaInspectionTool{
if (!refMethod.isReturnValueUsed()) {
return new ProblemDescriptor[]{manager.createProblemDescriptor(refMethod.getElement().getNavigationElement(),
InspectionsBundle.message("inspection.unused.return.value.problem.descriptor"),
getFix(processor), ProblemHighlightType.GENERIC_ERROR_OR_WARNING)};
getFix(processor), ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
false)};
}
}
java/java-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java
+3 -3
View File
@@ -32,8 +32,8 @@ import com.intellij.codeInspection.*;
import com.intellij.codeInspection.ex.EntryPointsManager;
import com.intellij.codeInspection.reference.*;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.extensions.ExtensionPoint;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.ReadonlyStatusHandler;
import com.intellij.psi.*;
@@ -42,8 +42,8 @@ import com.intellij.psi.search.PsiNonJavaFileReferenceProcessor;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.PsiUtilBase;
import com.intellij.util.VisibilityUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.VisibilityUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -181,7 +181,7 @@ public class VisibilityInspection extends GlobalJavaInspectionTool {
return new ProblemDescriptor[]{manager.createProblemDescriptor(psiElement,
InspectionsBundle.message("inspection.visibility.compose.suggestion", VisibilityUtil.toPresentableText(access)),
new AcceptSuggestedAccess(globalContext.getRefManager(), access),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING)};
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false)};
}
}
}
java/java-impl/src/com/intellij/codeInspection/wrongPackageStatement/WrongPackageStatementInspection.java
+3 -2
View File
@@ -55,7 +55,7 @@ public class WrongPackageStatementInspection extends BaseJavaLocalInspectionTool
return new ProblemDescriptor[]{manager.createProblemDescriptor(classes[0].getNameIdentifier(), description,
new AdjustPackageNameFix(javaFile, null, dirPackage),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING)};
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly)};
}
if (packageStatement != null) {
final PsiJavaCodeReferenceElement packageReference = packageStatement.getPackageReference();
@@ -75,7 +75,8 @@ public class WrongPackageStatementInspection extends BaseJavaLocalInspectionTool
String description = JavaErrorMessages.message("package.name.file.path.mismatch",
packageReference.getText(),
dirPackage.getQualifiedName());
return new ProblemDescriptor[]{manager.createProblemDescriptor(packageStatement, description, availableFixes.toArray(new LocalQuickFix[availableFixes.size()]), ProblemHighlightType.GENERIC_ERROR_OR_WARNING)};
return new ProblemDescriptor[]{manager.createProblemDescriptor(packageStatement, description, availableFixes.toArray(new LocalQuickFix[availableFixes.size()]), ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly)};
}
}
java/java-tests/testSrc/com/intellij/codeInspection/InlineSameParameterValueTest.java
+2 -2
View File
@@ -28,7 +28,7 @@ public class InlineSameParameterValueTest extends LightQuickFixTestCase {
final PsiElement psiElement = getFile().findElementAt(offset);
assert psiElement != null;
final ProblemDescriptor descriptor = InspectionManager.getInstance(getProject())
.createProblemDescriptor(psiElement, "", fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
.createProblemDescriptor(psiElement, "", fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, true);
fix.applyFix(getProject(), descriptor);
final String expectedFilePath = getBasePath() + "/after" + testName;
checkResultByFile("In file :" + expectedFilePath, expectedFilePath, false);
@@ -39,4 +39,4 @@ public class InlineSameParameterValueTest extends LightQuickFixTestCase {
protected String getBasePath() {
return "/quickFix/SameParameterValue";
}
}
}
platform/lang-api/src/com/intellij/codeInspection/InspectionManager.java
+13 -11
View File
@@ -37,19 +37,23 @@ public abstract class InspectionManager {
* @param psiElement problem is reported against
* @param descriptionTemplate problem message. Use <code>#ref</code> for a link to problem piece of code and <code>#loc</code> for location in source code.
* @param fix should be null if no fix is provided.
* @param onTheFly for local tools on batch run
*/
@NotNull public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement, @NotNull String descriptionTemplate, LocalQuickFix fix, ProblemHighlightType highlightType);
@NotNull public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement, @NotNull String descriptionTemplate,
LocalQuickFix fix, ProblemHighlightType highlightType, boolean onTheFly);
@NotNull public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement, @NotNull String descriptionTemplate, LocalQuickFix[] fixes, ProblemHighlightType highlightType);
@NotNull public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement, @NotNull String descriptionTemplate,
LocalQuickFix[] fixes, ProblemHighlightType highlightType,
boolean onTheFly);
@NotNull public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement, @NotNull String descriptionTemplate, LocalQuickFix[] fixes, ProblemHighlightType highlightType, boolean isAfterEndOfLine);
@NotNull public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement, @NotNull String descriptionTemplate,
LocalQuickFix[] fixes, ProblemHighlightType highlightType,
boolean onTheFly, boolean isAfterEndOfLine);
@NotNull public abstract ProblemDescriptor createProblemDescriptor(@NotNull PsiElement startElement,
@NotNull PsiElement endElement,
@NotNull String descriptionTemplate,
ProblemHighlightType highlightType,
LocalQuickFix... fixes
);
ProblemHighlightType highlightType, boolean onTheFly, LocalQuickFix... fixes);
@NotNull public abstract Project getProject();
@@ -57,17 +61,15 @@ public abstract class InspectionManager {
public abstract ProblemDescriptor createProblemDescriptor(@NotNull final PsiElement psiElement,
final TextRange rangeInElement,
@NotNull final String descriptionTemplate,
final ProblemHighlightType highlightType,
final LocalQuickFix... fixes);
final ProblemHighlightType highlightType, boolean onTheFly, final LocalQuickFix... fixes);
public abstract ProblemDescriptor createProblemDescriptor(@NotNull final PsiElement psiElement,
@NotNull final String descriptionTemplate,
final ProblemHighlightType highlightType,
@Nullable final HintAction hintAction,
final LocalQuickFix... fixes);
@Nullable final HintAction hintAction, boolean onTheFly, final LocalQuickFix... fixes);
public abstract ProblemDescriptor createProblemDescriptor(@NotNull final PsiElement psiElement,
@NotNull final String descriptionTemplate,
final boolean showTooltip,
final ProblemHighlightType highlightType, final LocalQuickFix... fixes);
final ProblemHighlightType highlightType, boolean onTheFly, final LocalQuickFix... fixes);
}
platform/lang-api/src/com/intellij/codeInspection/ProblemDescriptor.java
+1 -1
View File
@@ -19,7 +19,7 @@ import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.psi.PsiElement;
/**
* See {@link InspectionManager#createProblemDescriptor(PsiElement, String, LocalQuickFix, ProblemHighlightType) } for method descriptions.
* See {@link InspectionManager#createProblemDescriptor(com.intellij.psi.PsiElement, String, LocalQuickFix, ProblemHighlightType,boolean) } for method descriptions.
*/
public interface ProblemDescriptor extends CommonProblemDescriptor{
PsiElement getPsiElement();
platform/lang-api/src/com/intellij/codeInspection/ProblemsHolder.java
+13 -5
View File
@@ -37,11 +37,13 @@ public class ProblemsHolder {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.ProblemsHolder");
private final InspectionManager myManager;
private final PsiFile myFile;
private boolean myOnTheFly;
private List<ProblemDescriptor> myProblems = null;
public ProblemsHolder(@NotNull InspectionManager manager, @NotNull PsiFile file) {
public ProblemsHolder(@NotNull InspectionManager manager, @NotNull PsiFile file, boolean onTheFly) {
myManager = manager;
myFile = file;
myOnTheFly = onTheFly;
}
public void registerProblem(PsiElement psiElement, @Nls String descriptionTemplate, LocalQuickFix... fixes) {
@@ -52,7 +54,7 @@ public class ProblemsHolder {
String descriptionTemplate,
ProblemHighlightType highlightType,
LocalQuickFix... fixes) {
registerProblem(myManager.createProblemDescriptor(psiElement, descriptionTemplate, fixes, highlightType));
registerProblem(myManager.createProblemDescriptor(psiElement, descriptionTemplate, fixes, highlightType, myOnTheFly));
}
public void registerProblem(ProblemDescriptor problemDescriptor) {
@@ -77,7 +79,8 @@ public class ProblemsHolder {
fixes = ((LocalQuickFixProvider)reference).getQuickFixes();
}
registerProblem(myManager.createProblemDescriptor(reference.getElement(), reference.getRangeInElement(), descriptionTemplate, highlightType, fixes));
registerProblem(myManager.createProblemDescriptor(reference.getElement(), reference.getRangeInElement(), descriptionTemplate, highlightType,
myOnTheFly, fixes));
}
public void registerProblem(PsiReference reference) {
@@ -91,7 +94,8 @@ public class ProblemsHolder {
final TextRange rangeInElement,
final LocalQuickFix... fixes) {
final ProblemDescriptor descriptor = myManager.createProblemDescriptor(psiElement, rangeInElement, message, highlightType, fixes);
final ProblemDescriptor descriptor = myManager.createProblemDescriptor(psiElement, rangeInElement, message, highlightType, myOnTheFly,
fixes);
registerProblem(descriptor);
}
@@ -100,7 +104,7 @@ public class ProblemsHolder {
@NotNull final String message,
final LocalQuickFix... fixes) {
final ProblemDescriptor descriptor = myManager.createProblemDescriptor(psiElement, rangeInElement, message, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, fixes);
final ProblemDescriptor descriptor = myManager.createProblemDescriptor(psiElement, rangeInElement, message, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly, fixes);
registerProblem(descriptor);
}
@@ -124,4 +128,8 @@ public class ProblemsHolder {
public boolean hasResults() {
return myProblems != null && !myProblems.isEmpty();
}
public boolean isOnTheFly() {
return myOnTheFly;
}
}
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
+3 -4
View File
@@ -175,8 +175,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
}
}
ProblemDescriptor patchedDescriptor = iManager.createProblemDescriptor(myFile, hostRange, descriptor.getDescriptionTemplate(),
descriptor.getHighlightType(),
localFixes);
descriptor.getHighlightType(), true, localFixes);
LocalInspectionToolWrapper toolWrapper = tool2Wrapper.get(tool);
toolWrapper.addProblemDescriptors(Collections.singletonList(patchedDescriptor), true);
}
@@ -204,7 +203,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
ApplicationManager.getApplication().assertReadAccessAllowed();
ProblemsHolder holder = new ProblemsHolder(iManager, myFile);
ProblemsHolder holder = new ProblemsHolder(iManager, myFile, isOnTheFly);
PsiElementVisitor elementVisitor = tool.buildVisitor(holder, isOnTheFly);
//noinspection ConstantConditions
if(elementVisitor == null) {
@@ -471,7 +470,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass
private static void inspectInjectedPsi(PsiFile injectedPsi, List<InjectedPsiInspectionResult> result, List<LocalInspectionTool> tools) {
InspectionManager inspectionManager = InspectionManager.getInstance(injectedPsi.getProject());
final ProblemsHolder problemsHolder = new ProblemsHolder(inspectionManager, injectedPsi);
final ProblemsHolder problemsHolder = new ProblemsHolder(inspectionManager, injectedPsi, true);
final PsiElement host = injectedPsi.getContext();
final PsiElement[] elements = getElementsIntersectingRange(injectedPsi, 0, injectedPsi.getTextLength());
platform/lang-impl/src/com/intellij/codeInspection/GlobalInspectionUtil.java
+2 -3
View File
@@ -17,9 +17,9 @@
package com.intellij.codeInspection;
import com.intellij.codeInspection.reference.RefElement;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.openapi.util.TextRange;
/**
* User: Maxim.Mossienko
@@ -50,8 +50,7 @@ public class GlobalInspectionUtil {
elt,
range,
createInspectionMessage(message),
problemHighlightType
);
problemHighlightType, false);
problemDescriptionsProcessor.addProblemElement(
retrieveRefElement(elt, globalContext),
descriptor
platform/lang-impl/src/com/intellij/codeInspection/SyntaxErrorInspection.java
+6 -7
View File
@@ -18,11 +18,11 @@ package com.intellij.codeInspection;
import com.intellij.analysis.AnalysisScope;
import com.intellij.codeHighlighting.HighlightDisplayLevel;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.psi.*;
import com.intellij.codeInsight.highlighting.HighlightErrorFilter;
import com.intellij.codeInsight.daemon.impl.analysis.DefaultHighlightVisitor;
import com.intellij.codeInsight.highlighting.HighlightErrorFilter;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
@@ -107,8 +107,7 @@ public class SyntaxErrorInspection extends GlobalInspectionTool {
element,
GlobalInspectionUtil.createInspectionMessage(element.getErrorDescription()),
ProblemHighlightType.ERROR,
null
);
null, false);
}
else {
PsiElement parent = element;
@@ -126,7 +125,7 @@ public class SyntaxErrorInspection extends GlobalInspectionTool {
descriptor = manager.createProblemDescriptor(parent,
new TextRange(offset, offset+1),
GlobalInspectionUtil.createInspectionMessage(element.getErrorDescription()),
ProblemHighlightType.ERROR);
ProblemHighlightType.ERROR, false);
}
problemDescriptionsProcessor.addProblemElement(GlobalInspectionUtil.retrieveRefElement(element, globalContext), descriptor);
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionToolWrapper.java
+1 -1
View File
@@ -146,7 +146,7 @@ public class GlobalInspectionToolWrapper extends DescriptorProviderInspection {
((ProblemDescriptor)problemDescriptor).getEndElement(),
problemDescriptor.getDescriptionTemplate(),
new LocalQuickFix[]{(LocalQuickFix)fix},
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false, null);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false, null, false);
return QuickFixWrapper.wrap(descriptor, 0);
}
else {
platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionManagerEx.java
+15 -16
View File
@@ -98,58 +98,57 @@ public class InspectionManagerEx extends InspectionManager {
public ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement,
@NotNull String descriptionTemplate,
LocalQuickFix fix,
ProblemHighlightType highlightType) {
ProblemHighlightType highlightType, boolean onTheFly) {
LocalQuickFix[] quickFixes = fix != null ? new LocalQuickFix[]{fix} : null;
return createProblemDescriptor(psiElement, descriptionTemplate, quickFixes, highlightType);
return createProblemDescriptor(psiElement, descriptionTemplate, quickFixes, highlightType, onTheFly);
}
@NotNull
public ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement,
@NotNull String descriptionTemplate,
LocalQuickFix[] fixes,
ProblemHighlightType highlightType) {
return createProblemDescriptor(psiElement, descriptionTemplate, fixes, highlightType, false);
ProblemHighlightType highlightType, boolean onTheFly) {
return createProblemDescriptor(psiElement, descriptionTemplate, fixes, highlightType, onTheFly, false);
}
@NotNull
public ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement,
@NotNull String descriptionTemplate,
LocalQuickFix[] fixes,
ProblemHighlightType highlightType,
boolean isAfterEndOfLine) {
return new ProblemDescriptorImpl(psiElement, psiElement, descriptionTemplate, fixes, highlightType, isAfterEndOfLine, null);
ProblemHighlightType highlightType, boolean onTheFly, boolean isAfterEndOfLine) {
return new ProblemDescriptorImpl(psiElement, psiElement, descriptionTemplate, fixes, highlightType, isAfterEndOfLine, null, onTheFly);
}
@NotNull
public ProblemDescriptor createProblemDescriptor(@NotNull PsiElement startElement,
@NotNull PsiElement endElement,
@NotNull String descriptionTemplate,
ProblemHighlightType highlightType,
LocalQuickFix... fixes) {
return new ProblemDescriptorImpl(startElement, endElement, descriptionTemplate, fixes, highlightType, false, null);
ProblemHighlightType highlightType, boolean onTheFly, LocalQuickFix... fixes) {
return new ProblemDescriptorImpl(startElement, endElement, descriptionTemplate, fixes, highlightType, false, null, onTheFly);
}
public ProblemDescriptor createProblemDescriptor(@NotNull final PsiElement psiElement,
final TextRange rangeInElement,
@NotNull final String descriptionTemplate,
final ProblemHighlightType highlightType,
final LocalQuickFix... fixes) {
return new ProblemDescriptorImpl(psiElement, psiElement, descriptionTemplate, fixes, highlightType, false, rangeInElement);
final ProblemHighlightType highlightType, boolean onTheFly, final LocalQuickFix... fixes) {
return new ProblemDescriptorImpl(psiElement, psiElement, descriptionTemplate, fixes, highlightType, false, rangeInElement, onTheFly);
}
public ProblemDescriptor createProblemDescriptor(@NotNull final PsiElement psiElement, @NotNull final String descriptionTemplate, final ProblemHighlightType highlightType,
@Nullable final HintAction hintAction,
boolean onTheFly,
final LocalQuickFix... fixes) {
return new ProblemDescriptorImpl(psiElement, psiElement, descriptionTemplate, fixes, highlightType, false, null, hintAction);
return new ProblemDescriptorImpl(psiElement, psiElement, descriptionTemplate, fixes, highlightType, false, null, hintAction, onTheFly);
}
@Override
public ProblemDescriptor createProblemDescriptor(@NotNull PsiElement psiElement,
@NotNull String descriptionTemplate,
boolean showTooltip,
ProblemHighlightType highlightType, LocalQuickFix... fixes) {
return new ProblemDescriptorImpl(psiElement, psiElement, descriptionTemplate, fixes, highlightType, false, null, showTooltip, null);
ProblemHighlightType highlightType, boolean onTheFly, LocalQuickFix... fixes) {
return new ProblemDescriptorImpl(psiElement, psiElement, descriptionTemplate, fixes, highlightType, false, null, showTooltip, null,
onTheFly);
}
public GlobalInspectionContextImpl createNewGlobalContext(boolean reuse) {
platform/lang-impl/src/com/intellij/codeInspection/ex/LocalInspectionToolWrapper.java
+1 -1
View File
@@ -59,7 +59,7 @@ public final class LocalInspectionToolWrapper extends DescriptorProviderInspecti
}
public void processFile(final PsiFile file, final boolean filterSuppressed, final InspectionManager manager, final boolean isOnTheFly) {
final ProblemsHolder holder = new ProblemsHolder(manager, file);
final ProblemsHolder holder = new ProblemsHolder(manager, file, isOnTheFly);
final PsiElementVisitor customVisitor = myTool.buildVisitor(holder, isOnTheFly);
LOG.assertTrue(!(customVisitor instanceof PsiRecursiveElementVisitor), "The visitor returned from LocalInspectionTool.buildVisitor() must not be recursive");
platform/lang-impl/src/com/intellij/codeInspection/ex/ProblemDescriptorImpl.java
+14 -7
View File
@@ -49,14 +49,20 @@ public class ProblemDescriptorImpl extends CommonProblemDescriptorImpl implement
private TextAttributesKey myEnforcedTextAttributes;
public ProblemDescriptorImpl(@NotNull PsiElement startElement, @NotNull PsiElement endElement, String descriptionTemplate, LocalQuickFix[] fixes,
ProblemHighlightType highlightType, boolean isAfterEndOfLine, final TextRange rangeInElement) {
this(startElement, endElement, descriptionTemplate, fixes, highlightType, isAfterEndOfLine, rangeInElement, null);
ProblemHighlightType highlightType,
boolean isAfterEndOfLine,
final TextRange rangeInElement,
boolean onTheFly) {
this(startElement, endElement, descriptionTemplate, fixes, highlightType, isAfterEndOfLine, rangeInElement, null, onTheFly);
}
public ProblemDescriptorImpl(@NotNull PsiElement startElement, @NotNull PsiElement endElement, String descriptionTemplate, LocalQuickFix[] fixes,
ProblemHighlightType highlightType, boolean isAfterEndOfLine, final TextRange rangeInElement,
@Nullable HintAction hintAction) {
this(startElement, endElement, descriptionTemplate, fixes, highlightType, isAfterEndOfLine, rangeInElement, true, hintAction);
ProblemHighlightType highlightType,
boolean isAfterEndOfLine,
final TextRange rangeInElement,
@Nullable HintAction hintAction,
boolean onTheFly) {
this(startElement, endElement, descriptionTemplate, fixes, highlightType, isAfterEndOfLine, rangeInElement, true, hintAction, onTheFly);
}
public ProblemDescriptorImpl(@NotNull PsiElement startElement, @NotNull PsiElement endElement, String descriptionTemplate, LocalQuickFix[] fixes,
@@ -64,7 +70,8 @@ public class ProblemDescriptorImpl extends CommonProblemDescriptorImpl implement
boolean isAfterEndOfLine,
final TextRange rangeInElement,
final boolean tooltip,
@Nullable HintAction hintAction) {
@Nullable HintAction hintAction,
boolean onTheFly) {
super(fixes, descriptionTemplate);
myShowTooltip = tooltip;
@@ -82,7 +89,7 @@ public class ProblemDescriptorImpl extends CommonProblemDescriptorImpl implement
myHighlightType = highlightType;
final Project project = startElement.getProject();
final boolean useLazy = ApplicationManager.getApplication().isHeadlessEnvironment();
final boolean useLazy = !onTheFly || ApplicationManager.getApplication().isHeadlessEnvironment();
final SmartPointerManager manager = SmartPointerManager.getInstance(project);
myStartSmartPointer = useLazy? manager.createLazyPointer(startElement) : manager.createSmartPsiElementPointer(startElement);
myEndSmartPointer = startElement == endElement ? null : useLazy ? manager.createLazyPointer(endElement) : manager.createSmartPsiElementPointer(endElement);
platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java
+4 -4
View File
@@ -72,7 +72,7 @@ public class OfflineProblemDescriptorNode extends ProblemDescriptionNode {
final PsiElement psiElement = ((RefElement)element).getElement();
if (psiElement != null) {
PsiFile containingFile = psiElement.getContainingFile();
final ProblemsHolder holder = new ProblemsHolder(inspectionManager, containingFile);
final ProblemsHolder holder = new ProblemsHolder(inspectionManager, containingFile, false);
final LocalInspectionTool localInspectionTool = ((LocalInspectionToolWrapper)myTool).getTool();
final PsiElementVisitor visitor = localInspectionTool.buildVisitor(holder, false);
final PsiElement[] elementsInRange = LocalInspectionsPass.getElementsIntersectingRange(containingFile,
@@ -108,11 +108,11 @@ public class OfflineProblemDescriptorNode extends ProblemDescriptionNode {
final PsiElement psiElement = ((RefElement)element).getElement();
ProblemDescriptor descriptor = inspectionManager.createProblemDescriptor(psiElement, offlineProblemDescriptor.getDescription(),
(LocalQuickFix)null,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false);
final LocalQuickFix[] quickFixes = getFixes(descriptor, hints);
if (quickFixes != null) {
descriptor = inspectionManager.createProblemDescriptor(psiElement, offlineProblemDescriptor.getDescription(), quickFixes,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false);
}
setUserObject(descriptor);
return descriptor;
@@ -150,4 +150,4 @@ public class OfflineProblemDescriptorNode extends ProblemDescriptionNode {
public boolean isValid() {
return getDescriptor() != null && super.isValid();
}
}
}
plugins/InspectionGadgets/src/com/intellij/codeInspection/booleanIsAlwaysInverted/BooleanMethodIsAlwaysInvertedInspection.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class BooleanMethodIsAlwaysInvertedInspection extends GlobalJavaInspectio
return new ProblemDescriptor[] { manager.createProblemDescriptor(psiIdentifier,
InspectionsBundle.message("boolean.method.is.always.inverted.problem.descriptor"),
new InvertMethodFix(),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING)};
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false)};
}
}
return null;
plugins/InspectionGadgets/src/com/siyeh/ig/global/BooleanFieldAlwaysNegatedInspection.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class BooleanFieldAlwaysNegatedInspection extends BaseGlobalInspection {
}
return new ProblemDescriptor[]{manager.createProblemDescriptor(refField.getElement(), InspectionGadgetsBundle.message(
"boolean.field.always.negated.problem.descriptor"), (LocalQuickFix []) null,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING)};
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false)};
}
protected boolean queryExternalUsagesRequests(final RefManager manager, final GlobalJavaInspectionContext context,
plugins/InspectionGadgets/src/com/siyeh/ig/global/MethodReturnAlwaysConstantInspection.java
+2 -2
View File
@@ -85,7 +85,7 @@ public class MethodReturnAlwaysConstantInspection extends BaseGlobalInspection {
InspectionGadgetsBundle.message(
"method.return.always.constant.problem.descriptor"),
(LocalQuickFix[]) null,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false));
siblingRefMethod.putUserData(ALWAYS_CONSTANT,
Boolean.valueOf(true));
}
@@ -110,4 +110,4 @@ public class MethodReturnAlwaysConstantInspection extends BaseGlobalInspection {
final PsiExpression value = returnStatement.getReturnValue();
return value != null && PsiUtil.isConstantExpression(value);
}
}
}
plugins/InspectionGadgets/src/com/siyeh/ig/global/MethodReturnAlwaysIgnoredInspection.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class MethodReturnAlwaysIgnoredInspection extends BaseGlobalInspection {
final ProblemDescriptor descriptor = manager.createProblemDescriptor(method,
InspectionGadgetsBundle.message("method.return.always.ignored.problem.descriptor"),
(LocalQuickFix []) null,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false);
if (originalProblemDescriptors == null) {
return new ProblemDescriptor[]{descriptor};
} else {
plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateImportedTargetsInspection.java
+3 -2
View File
@@ -17,9 +17,9 @@ package com.intellij.lang.ant.validation;
import com.intellij.codeHighlighting.HighlightDisplayLevel;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.lang.ant.AntBundle;
import com.intellij.lang.ant.psi.AntFile;
import com.intellij.lang.ant.psi.AntProject;
@@ -70,7 +70,8 @@ public class AntDuplicateImportedTargetsInspection extends AntInspection {
final String duplicatedMessage =
AntBundle.message("target.is.duplicated.in.imported.file", name, target.getAntFile().getName());
problems
.add(manager.createProblemDescriptor(t, duplicatedMessage, LocalQuickFix.EMPTY_ARRAY, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
.add(manager.createProblemDescriptor(t, duplicatedMessage, LocalQuickFix.EMPTY_ARRAY, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly));
}
}
final int prolemCount = problems.size();
plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateTargetsInspection.java
+5 -3
View File
@@ -16,9 +16,9 @@
package com.intellij.lang.ant.validation;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.lang.ant.AntBundle;
import com.intellij.lang.ant.psi.AntFile;
import com.intellij.lang.ant.psi.AntProject;
@@ -64,9 +64,11 @@ public class AntDuplicateTargetsInspection extends AntInspection {
if (t != null) {
final String duplicatedMessage = AntBundle.message("target.is.duplicated", name);
problems.add(
manager.createProblemDescriptor(target, duplicatedMessage, LocalQuickFix.EMPTY_ARRAY, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
manager.createProblemDescriptor(target, duplicatedMessage, LocalQuickFix.EMPTY_ARRAY, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly));
problems
.add(manager.createProblemDescriptor(t, duplicatedMessage, LocalQuickFix.EMPTY_ARRAY, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
.add(manager.createProblemDescriptor(t, duplicatedMessage, LocalQuickFix.EMPTY_ARRAY, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly));
}
name2Target.put(name, target);
}
plugins/ant/src/com/intellij/lang/ant/validation/AntMissingPropertiesFileInspection.java
+5 -5
View File
@@ -16,9 +16,9 @@
package com.intellij.lang.ant.validation;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.lang.ant.AntBundle;
import com.intellij.lang.ant.psi.AntFile;
import com.intellij.lang.ant.psi.AntProject;
@@ -57,7 +57,7 @@ public class AntMissingPropertiesFileInspection extends AntInspection {
final AntProject project = ((AntFile)file).getAntProject();
if (project != null) {
final List<ProblemDescriptor> problems = new ArrayList<ProblemDescriptor>();
checkElement(project, manager, problems);
checkElement(project, manager, problems, isOnTheFly);
final int problemCount = problems.size();
if (problemCount > 0) {
return problems.toArray(new ProblemDescriptor[problemCount]);
@@ -69,7 +69,7 @@ public class AntMissingPropertiesFileInspection extends AntInspection {
private static void checkElement(final AntStructuredElement tag,
@NotNull InspectionManager manager,
final List<ProblemDescriptor> problems) {
final List<ProblemDescriptor> problems, boolean isOnTheFly) {
for (final PsiElement element : tag.getChildren()) {
if (element instanceof AntProperty) {
final AntProperty prop = (AntProperty)element;
@@ -77,12 +77,12 @@ public class AntMissingPropertiesFileInspection extends AntInspection {
final String filename = prop.getFileName();
if (filename != null && prop.getPropertiesFile() == null) {
problems.add(manager.createProblemDescriptor(prop, AntBundle.message("file.doesnt.exist", filename), LocalQuickFix.EMPTY_ARRAY,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly));
}
}
}
else if (element instanceof AntStructuredElement) {
checkElement((AntStructuredElement)element, manager, problems);
checkElement((AntStructuredElement)element, manager, problems, isOnTheFly);
}
}
}
plugins/devkit/src/inspections/ComponentNotRegisteredInspection.java
+2 -2
View File
@@ -133,7 +133,7 @@ public class ComponentNotRegisteredInspection extends DevKitInspectionBase {
classIdentifier,
DevKitBundle.message("inspections.component.not.registered.message",
DevKitBundle.message("new.menu.action.text")),
fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly);
return new ProblemDescriptor[]{problem};
} else {
// action IS registered, stop here
@@ -155,7 +155,7 @@ public class ComponentNotRegisteredInspection extends DevKitInspectionBase {
final ProblemDescriptor problem = manager.createProblemDescriptor(classIdentifier,
DevKitBundle.message("inspections.component.not.registered.message",
DevKitBundle.message(type.myPropertyKey)),
fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly);
return new ProblemDescriptor[]{problem};
} else {
// component IS registered, stop here
plugins/devkit/src/inspections/DescriptionNotFoundInspection.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class DescriptionNotFoundInspection extends DevKitInspectionBase{
.createProblemDescriptor(problem == null ? nameIdentifier : problem,
"Inspection does not have a description",
new LocalQuickFix[]{new CreateHtmlDescriptionFix(filename, module)},
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly);
return new ProblemDescriptor[]{problemDescriptor};
}
plugins/devkit/src/inspections/RegistrationProblemsInspection.java
+20 -24
View File
@@ -142,7 +142,7 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase {
DevKitBundle.message("keyword.extend"),
compClass.getQualifiedName()),
ImplementOrExtendFix.createFix(compClass, checkedClass, isOnTheFly),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly));
}
}
if (ActionType.ACTION.isOfType(checkedClass)) {
@@ -150,12 +150,13 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase {
problems = addProblem(problems, manager.createProblemDescriptor(nameIdentifier,
DevKitBundle.message("inspections.registration.problems.missing.noarg.ctor"),
new CreateConstructorFix(checkedClass, isOnTheFly),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly));
}
}
if (isAbstract(checkedClass)) {
problems = addProblem(problems, manager.createProblemDescriptor(nameIdentifier,
DevKitBundle.message("inspections.registration.problems.abstract"), LocalQuickFix.EMPTY_ARRAY, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
DevKitBundle.message("inspections.registration.problems.abstract"), LocalQuickFix.EMPTY_ARRAY, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly));
}
return problems != null ? problems.toArray(new ProblemDescriptor[problems.size()]) : null;
}
@@ -197,10 +198,10 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase {
private List<ProblemDescriptor> myList;
private final InspectionManager myManager;
private final XmlFile myXmlFile;
private final boolean myOnTheFly;
private final PsiManager myPsiManager;
private final GlobalSearchScope myScope;
private final Set<String> myInterfaceClasses = new THashSet<String>();
private boolean myOnTheFly;
public RegistrationChecker(InspectionManager manager, XmlFile xmlFile, boolean onTheFly) {
myManager = manager;
@@ -214,7 +215,7 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase {
if (impl == null) {
addProblem(component,
DevKitBundle.message("inspections.registration.problems.missing.implementation.class"),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly);
} else {
String intfName = null;
PsiClass intfClass = null;
@@ -228,21 +229,19 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase {
addProblem(impl,
DevKitBundle.message("inspections.registration.problems.cannot.resolve.class",
DevKitBundle.message("class.implementation")),
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL,
((LocalQuickFix)QuickFixFactory.getInstance()
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, myOnTheFly, ((LocalQuickFix)QuickFixFactory.getInstance()
.createCreateClassOrInterfaceFix(myXmlFile, implClassName, true, intfClass != null ? intfName : type.myClassName)));
} else {
final PsiClass componentClass = JavaPsiFacade.getInstance(myPsiManager.getProject()).findClass(type.myClassName, myScope);
if (componentClass != null && !implClass.isInheritor(componentClass, true) && type != ComponentType.APPLICATION) {
addProblem(impl,
DevKitBundle.message("inspections.registration.problems.component.should.implement", type.myClassName),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
ImplementOrExtendFix.createFix(componentClass, implClass, myOnTheFly));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly, ImplementOrExtendFix.createFix(componentClass, implClass, myOnTheFly));
}
if (isAbstract(implClass)) {
addProblem(impl,
DevKitBundle.message("inspections.registration.problems.abstract"),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly);
}
}
if (intfName != null) {
@@ -250,8 +249,7 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase {
addProblem(intf,
DevKitBundle.message("inspections.registration.problems.cannot.resolve.class",
DevKitBundle.message("class.interface")),
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL,
((LocalQuickFix)QuickFixFactory.getInstance()
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, myOnTheFly, ((LocalQuickFix)QuickFixFactory.getInstance()
.createCreateClassOrInterfaceFix(myXmlFile, intfName, false, type.myClassName)),
((LocalQuickFix)QuickFixFactory.getInstance()
.createCreateClassOrInterfaceFix(myXmlFile, intfName, true, type.myClassName)));
@@ -275,7 +273,7 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase {
if (intfClass != implClass && !implClass.isInheritor(intfClass, true)) {
addProblem(impl,
DevKitBundle.message("inspections.registration.problems.component.incompatible.interface", fqn),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly);
}
}
}
@@ -287,7 +285,7 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase {
if (myInterfaceClasses.contains(fqn)) {
addProblem(value,
DevKitBundle.message("inspections.registration.problems.component.duplicate.interface", fqn),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly);
return true;
}
return false;
@@ -322,7 +320,7 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase {
addProblem(token,
DevKitBundle.message("inspections.registration.problems.cannot.resolve.class",
DevKitBundle.message("class.action")),
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, ((LocalQuickFix)QuickFixFactory.getInstance()
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, myOnTheFly, ((LocalQuickFix)QuickFixFactory.getInstance()
.createCreateClassOrInterfaceFix(token, actionName, true, AnAction.class.getName())));
} else {
if (!type.isOfType(actionClass)) {
@@ -330,21 +328,19 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase {
if (psiClass != null && !actionClass.isInheritor(psiClass, true)) {
addProblem(token,
DevKitBundle.message("inspections.registration.problems.action.incompatible.class", type.myClassName),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
ImplementOrExtendFix.createFix(psiClass, actionClass, myOnTheFly));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly, ImplementOrExtendFix.createFix(psiClass, actionClass, myOnTheFly));
}
}
final ConstructorType noArgCtor = ConstructorType.getNoArgCtor(actionClass);
if (noArgCtor == null) {
addProblem(token,
DevKitBundle.message("inspections.registration.problems.missing.noarg.ctor"),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
new CreateConstructorFix(actionClass, myOnTheFly));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly, new CreateConstructorFix(actionClass, myOnTheFly));
}
if (isAbstract(actionClass)) {
addProblem(token,
DevKitBundle.message("inspections.registration.problems.abstract"),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly);
}
}
}
@@ -352,18 +348,18 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase {
return true;
}
private void addProblem(XmlTagValue impl, String problem, ProblemHighlightType type, LocalQuickFix... fixes) {
private void addProblem(XmlTagValue impl, String problem, ProblemHighlightType type, boolean isOnTheFly, LocalQuickFix... fixes) {
final XmlText[] textElements = impl.getTextElements();
for (XmlText text : textElements) {
if (text.getValue().trim().length() > 0) {
addProblem(text, problem, type, fixes);
addProblem(text, problem, type, isOnTheFly, fixes);
}
}
}
private void addProblem(PsiElement element, String problem, ProblemHighlightType type, LocalQuickFix... fixes) {
private void addProblem(PsiElement element, String problem, ProblemHighlightType type, boolean onTheFly, LocalQuickFix... fixes) {
if (myList == null) myList = new SmartList<ProblemDescriptor>();
myList.add(myManager.createProblemDescriptor(element, problem, fixes, type));
myList.add(myManager.createProblemDescriptor(element, problem, fixes, type, onTheFly));
}
@Nullable
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspection.java
+5 -6
View File
@@ -16,7 +16,6 @@
package org.jetbrains.plugins.groovy.codeInspection;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.psi.PsiElement;
@@ -90,14 +89,14 @@ public abstract class BaseInspection extends GroovySuppressableInspectionTool {
}
@Nullable
public ProblemDescriptor[] checkFile(@NotNull PsiFile psiFile, @NotNull InspectionManager inspectionManager, boolean onTheFly) {
public ProblemDescriptor[] checkFile(@NotNull PsiFile psiFile, @NotNull InspectionManager inspectionManager, boolean isOnTheFly) {
if (!(psiFile instanceof GroovyFile)) {
return super.checkFile(psiFile, inspectionManager, onTheFly);
return super.checkFile(psiFile, inspectionManager, isOnTheFly);
}
final GroovyFile groovyFile = (GroovyFile) psiFile;
final ProblemsHolder problemsHolder = new ProblemsHolder(inspectionManager, psiFile);
final BaseInspectionVisitor visitor = buildGroovyVisitor(problemsHolder, onTheFly);
final ProblemsHolder problemsHolder = new ProblemsHolder(inspectionManager, psiFile, isOnTheFly);
final BaseInspectionVisitor visitor = buildGroovyVisitor(problemsHolder, isOnTheFly);
groovyFile.accept(visitor);
final List<ProblemDescriptor> problems = problemsHolder.getResults();
if (problems == null) {
@@ -119,4 +118,4 @@ public abstract class BaseInspection extends GroovySuppressableInspectionTool {
}
protected abstract BaseInspectionVisitor buildVisitor();
}
}
plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java
+11 -9
View File
@@ -30,8 +30,8 @@ import com.intellij.codeInspection.ex.BaseLocalInspectionTool;
import com.intellij.ide.util.TreeClassChooser;
import com.intellij.ide.util.TreeClassChooserFactory;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.extensions.ExtensionPoint;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.ui.DialogWrapper;
@@ -286,7 +286,7 @@ public class I18nInspection extends BaseLocalInspectionTool {
}
final PsiCodeBlock body = method.getBody();
if (body != null) {
return checkElement(body, manager);
return checkElement(body, manager, isOnTheFly);
}
return null;
}
@@ -300,7 +300,7 @@ public class I18nInspection extends BaseLocalInspectionTool {
final PsiClassInitializer[] initializers = aClass.getInitializers();
List<ProblemDescriptor> result = new ArrayList<ProblemDescriptor>();
for (PsiClassInitializer initializer : initializers) {
final ProblemDescriptor[] descriptors = checkElement(initializer, manager);
final ProblemDescriptor[] descriptors = checkElement(initializer, manager, isOnTheFly);
if (descriptors != null) {
result.addAll(Arrays.asList(descriptors));
}
@@ -319,10 +319,10 @@ public class I18nInspection extends BaseLocalInspectionTool {
return null;
}
final PsiExpression initializer = field.getInitializer();
if (initializer != null) return checkElement(initializer, manager);
if (initializer != null) return checkElement(initializer, manager, isOnTheFly);
if (field instanceof PsiEnumConstant) {
return checkElement(((PsiEnumConstant)field).getArgumentList(), manager);
return checkElement(((PsiEnumConstant)field).getArgumentList(), manager, isOnTheFly);
}
return null;
}
@@ -342,8 +342,8 @@ public class I18nInspection extends BaseLocalInspectionTool {
return null;
}
private ProblemDescriptor[] checkElement(final PsiElement element, InspectionManager manager) {
StringI18nVisitor visitor = new StringI18nVisitor(manager);
private ProblemDescriptor[] checkElement(final PsiElement element, InspectionManager manager, boolean isOnTheFly) {
StringI18nVisitor visitor = new StringI18nVisitor(manager, isOnTheFly);
element.accept(visitor);
List<ProblemDescriptor> problems = visitor.getProblems();
return problems.isEmpty() ? null : problems.toArray(new ProblemDescriptor[problems.size()]);
@@ -382,9 +382,11 @@ public class I18nInspection extends BaseLocalInspectionTool {
private class StringI18nVisitor extends JavaRecursiveElementVisitor {
private final List<ProblemDescriptor> myProblems = new ArrayList<ProblemDescriptor>();
private final InspectionManager myManager;
private boolean myOnTheFly;
public StringI18nVisitor(final InspectionManager manager) {
public StringI18nVisitor(final InspectionManager manager, boolean onTheFly) {
myManager = manager;
myOnTheFly = onTheFly;
}
@Override public void visitAnonymousClass(PsiAnonymousClass aClass) {
@@ -436,7 +438,7 @@ public class I18nInspection extends BaseLocalInspectionTool {
final ProblemDescriptor problem = myManager
.createProblemDescriptor(expression,
description,
fixes.toArray(new LocalQuickFix[fixes.size()]), ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
fixes.toArray(new LocalQuickFix[fixes.size()]), ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly);
myProblems.add(problem);
}
}
plugins/java-i18n/src/com/intellij/codeInspection/i18n/InconsistentResourceBundleInspection.java
+3 -3
View File
@@ -167,7 +167,7 @@ public class InconsistentResourceBundleInspection extends DescriptorProviderInsp
String message = InspectionsBundle.message("inconsistent.bundle.property.inherited.with.the.same.value", parent.getName());
ProblemDescriptor descriptor = manager.createProblemDescriptor(property, message,
RemovePropertyLocalFix.INSTANCE,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false);
addProblemElement(getRefManager().getReference(file), descriptor);
}
parent = parents.get(parent);
@@ -199,7 +199,7 @@ public class InconsistentResourceBundleInspection extends DescriptorProviderInsp
String message = InspectionsBundle.message("inconsistent.bundle.property.error", inconsistentKey, parent.getName());
ProblemDescriptor descriptor = manager.createProblemDescriptor(property, message,
LocalQuickFix.EMPTY_ARRAY,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false);
addProblemElement(getRefManager().getReference(file), descriptor);
}
}
@@ -236,7 +236,7 @@ public class InconsistentResourceBundleInspection extends DescriptorProviderInsp
String message = InspectionsBundle.message("inconsistent.bundle.untranslated.property.error", untranslatedKey, file.getName());
ProblemDescriptor descriptor = manager.createProblemDescriptor(untranslatedProperty, message,
LocalQuickFix.EMPTY_ARRAY,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false);
addProblemElement(getRefManager().getReference(untranslatedFile), descriptor);
}
}
plugins/java-i18n/src/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspection.java
+12 -10
View File
@@ -68,7 +68,7 @@ public class InvalidPropertyKeyInspection extends BaseJavaLocalInspectionTool {
@Override
@Nullable
public ProblemDescriptor[] checkMethod(@NotNull PsiMethod method, @NotNull InspectionManager manager, boolean isOnTheFly) {
return checkElement(method, manager);
return checkElement(method, manager, isOnTheFly);
}
@Override
@@ -77,7 +77,7 @@ public class InvalidPropertyKeyInspection extends BaseJavaLocalInspectionTool {
final PsiClassInitializer[] initializers = aClass.getInitializers();
List<ProblemDescriptor> result = new ArrayList<ProblemDescriptor>();
for (PsiClassInitializer initializer : initializers) {
final ProblemDescriptor[] descriptors = checkElement(initializer, manager);
final ProblemDescriptor[] descriptors = checkElement(initializer, manager, isOnTheFly);
if (descriptors != null) {
result.addAll(Arrays.asList(descriptors));
}
@@ -90,16 +90,16 @@ public class InvalidPropertyKeyInspection extends BaseJavaLocalInspectionTool {
@Nullable
public ProblemDescriptor[] checkField(@NotNull PsiField field, @NotNull InspectionManager manager, boolean isOnTheFly) {
final PsiExpression initializer = field.getInitializer();
if (initializer != null) return checkElement(initializer, manager);
if (initializer != null) return checkElement(initializer, manager, isOnTheFly);
if (field instanceof PsiEnumConstant) {
return checkElement(((PsiEnumConstant)field).getArgumentList(), manager);
return checkElement(((PsiEnumConstant)field).getArgumentList(), manager, isOnTheFly);
}
return null;
}
@Nullable private static ProblemDescriptor[] checkElement(PsiElement element, final InspectionManager manager) {
UnresolvedPropertyVisitor visitor = new UnresolvedPropertyVisitor(manager);
@Nullable private static ProblemDescriptor[] checkElement(PsiElement element, final InspectionManager manager, boolean onTheFly) {
UnresolvedPropertyVisitor visitor = new UnresolvedPropertyVisitor(manager, onTheFly);
element.accept(visitor);
List<ProblemDescriptor> problems = visitor.getProblems();
return problems.isEmpty() ? null : problems.toArray(new ProblemDescriptor[problems.size()]);
@@ -123,10 +123,12 @@ public class InvalidPropertyKeyInspection extends BaseJavaLocalInspectionTool {
private static class UnresolvedPropertyVisitor extends JavaRecursiveElementWalkingVisitor {
private final InspectionManager myManager;
private final List<ProblemDescriptor> myProblems = new ArrayList<ProblemDescriptor>();
private boolean onTheFly;
public UnresolvedPropertyVisitor(final InspectionManager manager) {
public UnresolvedPropertyVisitor(final InspectionManager manager, boolean onTheFly) {
myManager = manager;
this.onTheFly = onTheFly;
}
@Override public void visitAnonymousClass(PsiAnonymousClass aClass) {
@@ -153,7 +155,7 @@ public class InvalidPropertyKeyInspection extends BaseJavaLocalInspectionTool {
final ProblemDescriptor problem = myManager.createProblemDescriptor(expression,
description,
new JavaCreatePropertyFix(expression, key, propertiesFiles),
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL);
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, onTheFly);
myProblems.add(problem);
} else
if (expression.getParent() instanceof PsiNameValuePair) {
@@ -168,7 +170,7 @@ public class InvalidPropertyKeyInspection extends BaseJavaLocalInspectionTool {
final ProblemDescriptor problem = myManager.createProblemDescriptor(expression,
description,
(LocalQuickFix)null,
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL);
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, onTheFly);
myProblems.add(problem);
}
}
@@ -196,7 +198,7 @@ public class InvalidPropertyKeyInspection extends BaseJavaLocalInspectionTool {
myProblems.add(myManager.createProblemDescriptor(methodCall,
CodeInsightBundle.message("property.has.more.parameters.than.passed", key, paramsCount, args.length-i-1),
new LocalQuickFix[0],
ProblemHighlightType.GENERIC_ERROR));
ProblemHighlightType.GENERIC_ERROR, onTheFly));
}
break;
}
plugins/java-i18n/src/com/intellij/lang/properties/UnusedMessageFormatParameterInspection.java
+10 -9
View File
@@ -15,24 +15,24 @@
*/
package com.intellij.lang.properties;
import com.intellij.codeInspection.ex.BaseLocalInspectionTool;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiElement;
import com.intellij.codeInspection.ex.BaseLocalInspectionTool;
import com.intellij.lang.ASTNode;
import com.intellij.lang.properties.psi.PropertiesFile;
import com.intellij.lang.properties.psi.Property;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.ArrayList;
import java.util.Set;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* User: anna
@@ -94,7 +94,8 @@ public class UnusedMessageFormatParameterInspection extends BaseLocalInspectionT
PsiElement valElement = nodes.length < 3 ? property : nodes[2].getPsi();
problemDescriptors.add(manager.createProblemDescriptor(valElement, PropertiesBundle.message(
"unused.message.format.parameter.problem.descriptor", integer.toString(), Integer.toString(i)),
(LocalQuickFix[])null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
(LocalQuickFix[])null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
isOnTheFly));
break;
}
}
plugins/properties/src/com/intellij/codeInspection/duplicatePropertyInspection/DuplicatePropertyInspection.java
+6 -3
View File
@@ -263,7 +263,8 @@ public class DuplicatePropertyInspection extends DescriptorProviderInspection {
}
if (duplicatesCount > 1) {
problemDescriptors.add(manager.createProblemDescriptor(psiFile, message.toString(),
(LocalQuickFix[])null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
(LocalQuickFix[])null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
false));
}
}
@@ -305,7 +306,8 @@ public class DuplicatePropertyInspection extends DescriptorProviderInspection {
}
if (duplicatesCount > 1 && CHECK_DUPLICATE_KEYS) {
problemDescriptors.add(manager.createProblemDescriptor(psiFile, message.toString(),
(LocalQuickFix[])null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
(LocalQuickFix[])null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
false));
}
}
@@ -343,7 +345,8 @@ public class DuplicatePropertyInspection extends DescriptorProviderInspection {
}
}
problemDescriptors.add(manager.createProblemDescriptor(psiFile, message.toString(),
(LocalQuickFix[])null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
(LocalQuickFix[])null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING,
false));
}
}
}
plugins/properties/src/com/intellij/lang/properties/UnusedPropertyInspection.java
+4 -3
View File
@@ -18,9 +18,9 @@ package com.intellij.lang.properties;
import com.intellij.codeInsight.CodeInsightUtilBase;
import com.intellij.codeInspection.*;
import com.intellij.concurrency.JobUtil;
import com.intellij.lang.ASTNode;
import com.intellij.lang.properties.psi.PropertiesFile;
import com.intellij.lang.properties.psi.Property;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
@@ -62,7 +62,7 @@ public class UnusedPropertyInspection extends LocalInspectionTool implements Cus
return "UnusedProperty";
}
public ProblemDescriptor[] checkFile(@NotNull PsiFile file, @NotNull final InspectionManager manager, boolean isOnTheFly) {
public ProblemDescriptor[] checkFile(@NotNull PsiFile file, @NotNull final InspectionManager manager, final boolean isOnTheFly) {
if (!(file instanceof PropertiesFile)) return null;
final List<Property> properties = ((PropertiesFile)file).getProperties();
Module module = ModuleUtil.findModuleForPsiElement(file);
@@ -86,7 +86,8 @@ public class UnusedPropertyInspection extends LocalInspectionTool implements Cus
ASTNode[] nodes = propertyNode.getChildren(null);
PsiElement key = nodes.length == 0 ? property : nodes[0].getPsi();
String description = PropertiesBundle.message("unused.property.problem.descriptor.name");
ProblemDescriptor descriptor = manager.createProblemDescriptor(key, description, RemovePropertyLocalFix.INSTANCE, ProblemHighlightType.LIKE_UNUSED_SYMBOL);
ProblemDescriptor descriptor = manager.createProblemDescriptor(key, description, RemovePropertyLocalFix.INSTANCE, ProblemHighlightType.LIKE_UNUSED_SYMBOL,
isOnTheFly);
synchronized (descriptors) {
descriptors.add(descriptor);
}
plugins/spellchecker/src/com/intellij/spellchecker/inspections/SpellCheckingInspection.java
+2 -1
View File
@@ -209,7 +209,8 @@ public class SpellCheckingInspection extends LocalInspectionTool {
final LocalQuickFix[] quickFixes = fixes.size() > 0 ? fixes.toArray(new LocalQuickFix[fixes.size()]) : null;
final ProblemDescriptor problemDescriptor = holder.getManager()
.createProblemDescriptor(token.getElement(), highlightRange, description, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, quickFixes);
.createProblemDescriptor(token.getElement(), highlightRange, description, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, holder.isOnTheFly(),
quickFixes);
for (SpellCheckerQuickFix fix : fixes) {
fix.setDescriptor(problemDescriptor);
}
plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java
+2 -2
View File
@@ -125,7 +125,7 @@ public class DependsOnGroupsInspection extends BaseJavaLocalInspectionTool {
LOGGER.info("group doesn't exist:" + methodName);
ProblemDescriptor descriptor = manager.createProblemDescriptor(annotation, "Group '" + methodName + "' is undefined.",
new GroupNameQuickFix(methodName),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly);
problemDescriptors.add(descriptor);
}
@@ -172,4 +172,4 @@ public class DependsOnGroupsInspection extends BaseJavaLocalInspectionTool {
*/
}
}
}
}
plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnMethodInspection.java
+7 -6
View File
@@ -88,7 +88,7 @@ public class DependsOnMethodInspection extends BaseJavaLocalInspectionTool
Matcher matcher = PATTERN.matcher(dep.getValue().getText());
while (matcher.find()) {
String methodName = matcher.group(1);
checkMethodNameDependency(manager, psiClass, methodName, dep, problemDescriptors);
checkMethodNameDependency(manager, psiClass, methodName, dep, problemDescriptors, isOnTheFly);
}
}
}
@@ -97,7 +97,8 @@ public class DependsOnMethodInspection extends BaseJavaLocalInspectionTool
return problemDescriptors.toArray(new ProblemDescriptor[] {} );
}
private static void checkMethodNameDependency(InspectionManager manager, PsiClass psiClass, String methodName, PsiNameValuePair dep, List<ProblemDescriptor> problemDescriptors) {
private static void checkMethodNameDependency(InspectionManager manager, PsiClass psiClass, String methodName, PsiNameValuePair dep,
List<ProblemDescriptor> problemDescriptors, boolean onTheFly) {
LOGGER.debug("Found dependsOnMethods with text: " + methodName);
if (methodName.length() > 0 && methodName.charAt(methodName.length() - 1) == ')') {
@@ -106,7 +107,7 @@ public class DependsOnMethodInspection extends BaseJavaLocalInspectionTool
ProblemDescriptor descriptor = manager.createProblemDescriptor(dep,
"Method '" + methodName + "' should not include () characters.",
(LocalQuickFix) null,
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL);
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, onTheFly);
problemDescriptors.add(descriptor);
@@ -118,7 +119,7 @@ public class DependsOnMethodInspection extends BaseJavaLocalInspectionTool
ProblemDescriptor descriptor = manager.createProblemDescriptor(dep,
"Method '" + methodName + "' unknown.",
(LocalQuickFix) null,
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL);
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, onTheFly);
problemDescriptors.add(descriptor);
} else {
@@ -130,11 +131,11 @@ public class DependsOnMethodInspection extends BaseJavaLocalInspectionTool
ProblemDescriptor descriptor = manager.createProblemDescriptor(dep,
"Method '" + methodName + "' is not a test or configuration method.",
(LocalQuickFix) null,
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL);
ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, onTheFly);
problemDescriptors.add(descriptor);
}
}
}
}
}
}
plugins/testng/src/com/theoryinpractice/testng/inspection/JUnitConvertTool.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class JUnitConvertTool extends BaseJavaLocalInspectionTool {
final PsiIdentifier nameIdentifier = psiClass.getNameIdentifier();
ProblemDescriptor descriptor = manager.createProblemDescriptor(nameIdentifier != null ? nameIdentifier : psiClass, "TestCase can be converted to TestNG",
new JUnitConverterQuickFix(),
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly);
return new ProblemDescriptor[]{descriptor};
}
return null;
plugins/testng/src/com/theoryinpractice/testng/inspection/UndeclaredTestInspection.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class UndeclaredTestInspection extends BaseJavaLocalInspectionTool {
return new ProblemDescriptor[]{manager.createProblemDescriptor(nameIdentifier, "Undeclared test \'" + aClass.getName() + "\'",
new LocalQuickFix[]{new RegisterClassFix(aClass),
new CreateTestngFix()},
ProblemHighlightType.GENERIC_ERROR_OR_WARNING)};
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly)};
}
return null;
}
plugins/ui-designer/src/com/intellij/uiDesigner/inspections/BaseFormInspection.java
+1 -1
View File
@@ -96,7 +96,7 @@ public abstract class BaseFormInspection extends BaseJavaLocalInspectionTool imp
if (rootContainer.isInspectionSuppressed(getShortName(), null)) {
return null;
}
final FormFileErrorCollector collector = new FormFileErrorCollector(file, manager);
final FormFileErrorCollector collector = new FormFileErrorCollector(file, manager, isOnTheFly);
startCheckForm(rootContainer);
FormEditingUtil.iterate(rootContainer, new FormEditingUtil.ComponentVisitor() {
public boolean visit(final IComponent component) {
plugins/ui-designer/src/com/intellij/uiDesigner/inspections/FormFileErrorCollector.java
+15 -10
View File
@@ -15,18 +15,21 @@
*/
package com.intellij.uiDesigner.inspections;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
import com.intellij.uiDesigner.lw.IProperty;
import com.intellij.uiDesigner.lw.IComponent;
import com.intellij.uiDesigner.make.FormElementNavigatable;
import com.intellij.codeInspection.*;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.ex.ProblemDescriptorImpl;
import com.intellij.psi.PsiFile;
import com.intellij.openapi.util.JDOMUtil;
import com.intellij.psi.PsiFile;
import com.intellij.uiDesigner.lw.IComponent;
import com.intellij.uiDesigner.lw.IProperty;
import com.intellij.uiDesigner.make.FormElementNavigatable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
/**
* @author yole
@@ -34,11 +37,13 @@ import java.util.ArrayList;
public class FormFileErrorCollector extends FormErrorCollector {
private final InspectionManager myManager;
private final PsiFile myFile;
private boolean myOnTheFly;
private final List<ProblemDescriptor> myProblems = new ArrayList<ProblemDescriptor>();
public FormFileErrorCollector(final PsiFile file, final InspectionManager manager) {
public FormFileErrorCollector(final PsiFile file, final InspectionManager manager, boolean onTheFly) {
myManager = manager;
myFile = file;
myOnTheFly = onTheFly;
}
public void addError(final String inspectionId, final IComponent component, @Nullable IProperty prop,
@@ -46,7 +51,7 @@ public class FormFileErrorCollector extends FormErrorCollector {
@Nullable EditorQuickFixProvider editorQuickFixProvider) {
final ProblemDescriptor problemDescriptor = myManager.createProblemDescriptor(myFile, JDOMUtil.escapeText(errorMessage),
(LocalQuickFix)null,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly);
if (problemDescriptor instanceof ProblemDescriptorImpl && component != null) {
FormElementNavigatable navigatable = new FormElementNavigatable(myFile.getProject(), myFile.getVirtualFile(),
component.getId());
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/CheckNodeTest.java
+10 -11
View File
@@ -15,29 +15,28 @@
*/
package org.intellij.lang.xpath.validation.inspections;
import org.intellij.lang.xpath.context.ContextProvider;
import org.intellij.lang.xpath.context.NamespaceContext;
import org.intellij.lang.xpath.psi.PrefixedName;
import org.intellij.lang.xpath.psi.XPathNodeTest;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.psi.xml.XmlElement;
import org.intellij.lang.xpath.context.ContextProvider;
import org.intellij.lang.xpath.context.NamespaceContext;
import org.intellij.lang.xpath.psi.PrefixedName;
import org.intellij.lang.xpath.psi.XPathNodeTest;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.xml.namespace.QName;
import java.util.Set;
import java.text.MessageFormat;
import java.util.Set;
public class CheckNodeTest extends XPathInspection {
@NonNls
private static final String SHORT_NAME = "CheckNodeTest";
protected Visitor createVisitor(InspectionManager manager) {
return new MyVisitor(manager);
protected Visitor createVisitor(InspectionManager manager, boolean isOnTheFly) {
return new MyVisitor(manager, isOnTheFly);
}
@NotNull
@@ -56,8 +55,8 @@ public class CheckNodeTest extends XPathInspection {
}
final static class MyVisitor extends Visitor {
MyVisitor(InspectionManager manager) {
super(manager);
MyVisitor(InspectionManager manager, boolean isOnTheFly) {
super(manager, isOnTheFly);
}
protected void checkNodeTest(XPathNodeTest nodeTest) {
@@ -122,7 +121,7 @@ public class CheckNodeTest extends XPathInspection {
final LocalQuickFix[] fixes = contextProvider.getQuickFixFactory().createUnknownNodeTestFixes(nodeTest);
addProblem(myManager.createProblemDescriptor(nodeTest, "<html>Unknown " + type + " name " + name + "</html>",
fixes, ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
fixes, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly));
}
private static boolean matches(@Nullable PrefixedName prefixedName, QName element, NamespaceContext namespaceContext, XmlElement context) {
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/HardwiredNamespacePrefix.java
+12 -13
View File
@@ -15,27 +15,26 @@
*/
package org.intellij.lang.xpath.validation.inspections;
import org.intellij.lang.xpath.psi.XPathExpression;
import org.intellij.lang.xpath.psi.XPathBinaryExpression;
import org.intellij.lang.xpath.psi.XPathFunctionCall;
import org.intellij.lang.xpath.psi.XPathString;
import org.intellij.lang.xpath.XPathTokenTypes;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import org.intellij.lang.xpath.XPathTokenTypes;
import org.intellij.lang.xpath.psi.XPathBinaryExpression;
import org.intellij.lang.xpath.psi.XPathExpression;
import org.intellij.lang.xpath.psi.XPathFunctionCall;
import org.intellij.lang.xpath.psi.XPathString;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
public class HardwiredNamespacePrefix extends XPathInspection {
public boolean isEnabledByDefault() {
return true;
}
protected Visitor createVisitor(final InspectionManager manager) {
return new Visitor(manager) {
protected Visitor createVisitor(final InspectionManager manager, final boolean isOnTheFly) {
return new Visitor(manager, isOnTheFly) {
protected void checkExpression(XPathExpression expression) {
if (!(expression instanceof XPathBinaryExpression)) {
return;
@@ -48,12 +47,12 @@ public class HardwiredNamespacePrefix extends XPathInspection {
if (isNameComparison(lop, rop)) {
assert rop != null;
final ProblemDescriptor p = manager.createProblemDescriptor(rop, "Hardwired namespace prefix", LocalQuickFix.EMPTY_ARRAY,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly);
addProblem(p);
} else if (isNameComparison(rop, lop)) {
assert lop != null;
final ProblemDescriptor p = manager.createProblemDescriptor(lop, "Hardwired namespace prefix", LocalQuickFix.EMPTY_ARRAY,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, isOnTheFly);
addProblem(p);
} else if (isNameFunctionCall(lop)) {
// TODO
@@ -93,4 +92,4 @@ public class HardwiredNamespacePrefix extends XPathInspection {
public String getShortName() {
return "HardwiredNamespacePrefix";
}
}
}
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/ImplicitTypeConversion.java
+12 -14
View File
@@ -22,25 +22,23 @@
*/
package org.intellij.lang.xpath.validation.inspections;
import org.intellij.lang.xpath.context.ContextProvider;
import org.intellij.lang.xpath.psi.XPathExpression;
import org.intellij.lang.xpath.psi.XPathType;
import org.intellij.lang.xpath.psi.XPathFunctionCall;
import org.intellij.lang.xpath.validation.ExpectedTypeUtil;
import org.intellij.lang.xpath.validation.inspections.quickfix.XPathQuickFixFactory;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.util.Alarm;
import org.intellij.lang.xpath.context.ContextProvider;
import org.intellij.lang.xpath.psi.XPathExpression;
import org.intellij.lang.xpath.psi.XPathFunctionCall;
import org.intellij.lang.xpath.psi.XPathType;
import org.intellij.lang.xpath.validation.ExpectedTypeUtil;
import org.intellij.lang.xpath.validation.inspections.quickfix.XPathQuickFixFactory;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jdom.Element;
import javax.swing.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
@@ -83,8 +81,8 @@ public class ImplicitTypeConversion extends XPathInspection {
return true;
}
protected Visitor createVisitor(InspectionManager manager) {
return new MyElementVisitor(manager);
protected Visitor createVisitor(InspectionManager manager, boolean isOnTheFly) {
return new MyElementVisitor(manager, isOnTheFly);
}
@Nullable
@@ -107,8 +105,8 @@ public class ImplicitTypeConversion extends XPathInspection {
}
final class MyElementVisitor extends Visitor {
MyElementVisitor(InspectionManager manager) {
super(manager);
MyElementVisitor(InspectionManager manager, boolean isOnTheFly) {
super(manager, isOnTheFly);
}
protected void checkExpression(@NotNull XPathExpression expression) {
@@ -146,7 +144,7 @@ public class ImplicitTypeConversion extends XPathInspection {
addProblem(myManager.createProblemDescriptor(expression,
"Expression should be of type '" + type.getName() + "'", fixes,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly));
}
}
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/IndexZeroPredicate.java
+10 -11
View File
@@ -15,19 +15,18 @@
*/
package org.intellij.lang.xpath.validation.inspections;
import org.intellij.lang.xpath.psi.*;
import org.intellij.lang.xpath.validation.ExpectedTypeUtil;
import org.intellij.lang.xpath.XPathTokenTypes;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemHighlightType;
import org.intellij.lang.xpath.XPathTokenTypes;
import org.intellij.lang.xpath.psi.*;
import org.intellij.lang.xpath.validation.ExpectedTypeUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
public class IndexZeroPredicate extends XPathInspection {
protected Visitor createVisitor(InspectionManager manager) {
return new MyVisitor(manager);
protected Visitor createVisitor(InspectionManager manager, boolean isOnTheFly) {
return new MyVisitor(manager, isOnTheFly);
}
@NotNull
@@ -46,8 +45,8 @@ public class IndexZeroPredicate extends XPathInspection {
}
final static class MyVisitor extends Visitor {
MyVisitor(InspectionManager manager) {
super(manager);
MyVisitor(InspectionManager manager, boolean isOnTheFly) {
super(manager, isOnTheFly);
}
protected void checkPredicate(XPathPredicate predicate) {
@@ -57,7 +56,7 @@ public class IndexZeroPredicate extends XPathInspection {
if (isZero(expr)) {
addProblem(myManager.createProblemDescriptor(expr,
"Use of 0 as predicate index", (LocalQuickFix)null,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly));
}
} else if (expr instanceof XPathBinaryExpression && expr.getType() == XPathType.BOOLEAN) {
final XPathBinaryExpression expression = (XPathBinaryExpression)expr;
@@ -74,7 +73,7 @@ public class IndexZeroPredicate extends XPathInspection {
if (isPosition(rOp)) {
addProblem(myManager.createProblemDescriptor(expr,
"Comparing position() to 0", (LocalQuickFix)null,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly));
}
} else if (isZero(rOp)) {
assert rOp != null;
@@ -82,7 +81,7 @@ public class IndexZeroPredicate extends XPathInspection {
if (isPosition(lOp)) {
addProblem(myManager.createProblemDescriptor(expr,
"Comparing position() to 0", (LocalQuickFix)null,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly));
}
}
}
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/RedundantTypeConversion.java
+9 -10
View File
@@ -15,16 +15,15 @@
*/
package org.intellij.lang.xpath.validation.inspections;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemHighlightType;
import org.intellij.lang.xpath.context.ContextProvider;
import org.intellij.lang.xpath.psi.XPathExpression;
import org.intellij.lang.xpath.psi.XPathFunctionCall;
import org.intellij.lang.xpath.psi.XPathType;
import org.intellij.lang.xpath.validation.ExpectedTypeUtil;
import org.intellij.lang.xpath.validation.inspections.quickfix.XPathQuickFixFactory;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemHighlightType;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -52,8 +51,8 @@ public class RedundantTypeConversion extends XPathInspection {
return true;
}
protected Visitor createVisitor(InspectionManager manager) {
return new MyElementVisitor(manager);
protected Visitor createVisitor(InspectionManager manager, boolean isOnTheFly) {
return new MyElementVisitor(manager, isOnTheFly);
}
@Nullable
@@ -63,8 +62,8 @@ public class RedundantTypeConversion extends XPathInspection {
final class MyElementVisitor extends Visitor {
MyElementVisitor(InspectionManager manager) {
super(manager);
MyElementVisitor(InspectionManager manager, boolean isOnTheFly) {
super(manager, isOnTheFly);
}
protected void checkExpression(final @NotNull XPathExpression expr) {
@@ -79,7 +78,7 @@ public class RedundantTypeConversion extends XPathInspection {
addProblem(myManager.createProblemDescriptor(expression,
"Redundant conversion to type '" + convertedType.getName() + "'", fixes,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly));
} else if (CHECK_ANY) {
final XPathType expectedType = ExpectedTypeUtil.getExpectedType(expression);
if (expectedType == XPathType.ANY) {
@@ -88,7 +87,7 @@ public class RedundantTypeConversion extends XPathInspection {
addProblem(myManager.createProblemDescriptor(expression,
"Redundant conversion to type '" + expectedType.getName() + "'", fixes,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, myOnTheFly));
}
}
}
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/validation/inspections/XPathInspection.java
+9 -12
View File
@@ -15,26 +15,21 @@
*/
package org.intellij.lang.xpath.validation.inspections;
import com.intellij.codeInspection.CustomSuppressableInspectionTool;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.SuppressIntentionAction;
import com.intellij.codeInspection.*;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiRecursiveElementVisitor;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.intellij.lang.xpath.XPathFileType;
import org.intellij.lang.xpath.context.ContextProvider;
import org.intellij.lang.xpath.psi.XPathElement;
import org.intellij.lang.xpath.psi.XPathExpression;
import org.intellij.lang.xpath.psi.XPathNodeTest;
import org.intellij.lang.xpath.psi.XPathPredicate;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public abstract class XPathInspection extends LocalInspectionTool implements CustomSuppressableInspectionTool {
@@ -57,12 +52,12 @@ public abstract class XPathInspection extends LocalInspectionTool implements Cus
return ContextProvider.getContextProvider(element.getContainingFile()).getQuickFixFactory().isSuppressedFor(element, this);
}
protected abstract Visitor createVisitor(InspectionManager manager);
protected abstract Visitor createVisitor(InspectionManager manager, boolean isOnTheFly);
@Nullable
public ProblemDescriptor[] checkFile(@NotNull PsiFile file, @NotNull InspectionManager manager, boolean isOnTheFly) {
if (file.getLanguage() != XPathFileType.XPATH.getLanguage()) return null;
final Visitor visitor = createVisitor(manager);
final Visitor visitor = createVisitor(manager, isOnTheFly);
file.accept(visitor);
@@ -71,10 +66,12 @@ public abstract class XPathInspection extends LocalInspectionTool implements Cus
protected static abstract class Visitor extends PsiRecursiveElementVisitor {
protected final InspectionManager myManager;
private SmartList<ProblemDescriptor> myProblems;
protected boolean myOnTheFly;
private SmartList<ProblemDescriptor> myProblems;
public Visitor(InspectionManager manager) {
public Visitor(InspectionManager manager, boolean isOnTheFly) {
myManager = manager;
this.myOnTheFly = isOnTheFly;
}
public void visitElement(PsiElement psiElement) {
samples/comparingReferences/source/com/intellij/codeInspection/ComparingReferencesInspection.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class ComparingReferencesInspection extends BaseJavaLocalInspectionTool {
if (problemList[0] == null) problemList[0] = new ArrayList();
problemList[0].add(manager.createProblemDescriptor(expression, DESCRIPTION_TEMPLATE,
myQuickFix,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING));
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, onTheFly));
}
}
}
xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsHighlightingUtil.java
+3 -3
View File
@@ -20,16 +20,16 @@ import com.intellij.codeInsight.daemon.impl.AnnotationHolderImpl;
import com.intellij.codeInsight.daemon.impl.SeverityRegistrar;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.lang.annotation.Annotation;
import com.intellij.lang.annotation.HighlightSeverity;
import com.intellij.openapi.editor.colors.CodeInsightColors;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.util.Function;
import org.jetbrains.annotations.Nullable;
@@ -55,7 +55,7 @@ public class DomElementsHighlightingUtil {
return createProblemDescriptors(problemDescriptor, new Function<Pair<TextRange, PsiElement>, ProblemDescriptor>() {
public ProblemDescriptor fun(final Pair<TextRange, PsiElement> s) {
return manager
.createProblemDescriptor(s.second, s.first, problemDescriptor.getDescriptionTemplate(), type, problemDescriptor.getFixes());
.createProblemDescriptor(s.second, s.first, problemDescriptor.getDescriptionTemplate(), type, true, problemDescriptor.getFixes());
}
});
}