azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor optimization

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-01-14 19:40:41 +03:00
parent 17e8eafe33
commit 83ca4b84f9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt
+5 -2
View File
@@ -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)