Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.github.packageurl.PackageURL;
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
import com.intellij.codeInsight.daemon.HighlightDisplayKey;
import com.intellij.codeHighlighting.HighlightDisplayLevel;
import com.intellij.codeInspection.InspectionProfile;
import com.intellij.codeInspection.InspectionProfileEntry;
import com.intellij.lang.annotation.AnnotationBuilder;
Expand Down Expand Up @@ -165,7 +166,7 @@ public void apply(@NotNull PsiFile file, Map<Dependency, Result> annotationResul
if (!quickfixes.isEmpty() && this.isQuickFixApplicable(e)) {
quickfixes.forEach((source, report) ->{
AnnotationBuilder builder = holder
.newAnnotation(getHighlightSeverity(report), messageBuilder.toString())
.newAnnotation(getHighlightSeverity(report, e), messageBuilder.toString())
.tooltip(tooltipBuilder.toString())
.range(e);
if(CAIntentionAction.isQuickFixAvailable(report)) {
Expand All @@ -189,16 +190,24 @@ public void apply(@NotNull PsiFile file, Map<Dependency, Result> annotationResul
}

@NotNull
private static HighlightSeverity getHighlightSeverity(DependencyReport report) {
if(CAIntentionAction.thereAreNoIssues(report) && CAIntentionAction.thereIsRecommendation(report))
{
return HighlightSeverity.WEAK_WARNING;
private HighlightSeverity getHighlightSeverity(DependencyReport report, @NotNull PsiElement context) {
// Get the configured severity from the inspection settings
final InspectionProfileEntry inspection = this.getInspection(context, this.getInspectionShortName());
if (inspection != null) {
final InspectionProfile profile = InspectionProjectProfileManager.getInstance(context.getProject()).getCurrentProfile();
final HighlightDisplayKey key = HighlightDisplayKey.find(this.getInspectionShortName());
if (key != null) {
HighlightDisplayLevel level = profile.getErrorLevel(key, context);
return level.getSeverity();
}
}
else
{

// Fallback to original logic if inspection settings can't be determined
if(CAIntentionAction.thereAreNoIssues(report) && CAIntentionAction.thereIsRecommendation(report)) {
return HighlightSeverity.WEAK_WARNING;
} else {
return HighlightSeverity.ERROR;
}

}

abstract protected String getInspectionShortName();
Expand Down
Loading