From 63cb0835cb4a8d85dce6985968c8fd447ea2d3ff Mon Sep 17 00:00:00 2001 From: Maxim Kropotov Date: Thu, 19 Jul 2018 15:58:34 +0300 Subject: [PATCH] map severities reported by external annotators to appropriate ProblemHighlightingType when running in batch mode for ESLint, TSLint, WEB-22548 --- .../ExternalAnnotatorInspectionVisitor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ExternalAnnotatorInspectionVisitor.java b/platform/analysis-impl/src/com/intellij/codeInspection/ExternalAnnotatorInspectionVisitor.java index 2ceff50752d0..e5d0d8ca27cf 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ExternalAnnotatorInspectionVisitor.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ExternalAnnotatorInspectionVisitor.java @@ -16,6 +16,7 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.daemon.impl.AnnotationHolderImpl; +import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.lang.annotation.Annotation; import com.intellij.lang.annotation.AnnotationSession; @@ -74,16 +75,14 @@ public class ExternalAnnotatorInspectionVisitor extends PsiElementVisitor { return ReadAction.compute(() -> { AnnotationHolderImpl annotationHolder = new AnnotationHolderImpl(new AnnotationSession(file), true); annotator.apply(file, annotationResult, annotationHolder); - return convertToProblemDescriptors(annotationHolder, manager, file); + return convertToProblemDescriptors(annotationHolder, file); }); } return ProblemDescriptor.EMPTY_ARRAY; } @NotNull - private static ProblemDescriptor[] convertToProblemDescriptors(@NotNull final List annotations, - @NotNull final InspectionManager manager, - @NotNull final PsiFile file) { + private static ProblemDescriptor[] convertToProblemDescriptors(@NotNull final List annotations, @NotNull final PsiFile file) { if (annotations.isEmpty()) { return ProblemDescriptor.EMPTY_ARRAY; } @@ -109,11 +108,12 @@ public class ExternalAnnotatorInspectionVisitor extends PsiElementVisitor { } LocalQuickFix[] quickFixes = toLocalQuickFixes(annotation.getQuickFixes(), quickFixMappingCache); + ProblemHighlightType highlightType = HighlightInfo.convertSeverityToProblemHighlight(annotation.getSeverity()); ProblemDescriptor descriptor = new ProblemDescriptorBase(startElement, endElement, annotation.getMessage(), quickFixes, - ProblemHighlightType.GENERIC_ERROR_OR_WARNING, + highlightType, annotation.isAfterEndOfLine(), null, true,