From 83ca4b84f97957ef3e1b77260734c39b6b122462 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 14 Jan 2016 19:40:41 +0300 Subject: [PATCH] Minor optimization --- .../jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt index 47d28d8eaf2..3abd9ad648a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt @@ -80,8 +80,11 @@ open class KotlinPsiChecker : Annotator, HighlightRangeExtension { open protected fun shouldSuppressUnusedParameter(parameter: KtParameter): Boolean = false fun annotateElement(element: PsiElement, holder: AnnotationHolder, diagnostics: Diagnostics) { + val diagnosticsForElement = diagnostics.forElement(element) + if (diagnosticsForElement.isEmpty()) return + if (ProjectRootsUtil.isInProjectSource(element) || element.containingFile is KtCodeFragment) { - ElementAnnotator(element, holder, { param -> shouldSuppressUnusedParameter(param) }).registerDiagnosticsAnnotations(diagnostics.forElement(element)) + ElementAnnotator(element, holder, { param -> shouldSuppressUnusedParameter(param) }).registerDiagnosticsAnnotations(diagnosticsForElement) } } @@ -263,7 +266,7 @@ private class AnnotationPresentationInfo( val textAttributes: TextAttributesKey? = null) { fun create(diagnostic: Diagnostic, range: TextRange, holder: AnnotationHolder): Annotation { - val defaultMessage = nonDefaultMessage?: getDefaultMessage(diagnostic) + val defaultMessage = nonDefaultMessage ?: getDefaultMessage(diagnostic) val annotation = when (diagnostic.severity) { Severity.ERROR -> holder.createErrorAnnotation(range, defaultMessage)