From 04115ab8bf952b7cd52588fb42ba9b6d04d12828 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 24 Oct 2013 16:31:09 +0400 Subject: [PATCH] KT-4070 KotlinSignature icons in the gutter on a Java source blink/flash on every change of the file #KT-4070 Fixed --- .../ktSignature/KotlinSignatureInJavaMarkerProvider.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java index 85c60dc29ba..528f624ab37 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java @@ -214,7 +214,7 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider { private static class MyLineMarkerInfo extends LineMarkerInfo { public MyLineMarkerInfo(PsiModifierListOwner element, @Nullable List errors, boolean hasAnnotation) { - super(element, element.getTextOffset(), errors != null ? AllIcons.Ide.Error : JetIcons.SMALL_LOGO, Pass.UPDATE_ALL, + super(element, element.getTextOffset(), errors != null ? AllIcons.Ide.Error : JetIcons.SMALL_LOGO, Pass.UPDATE_OVERRIDEN_MARKERS, new TooltipProvider(errors), hasAnnotation ? NAVIGATION_HANDLER : null); } @@ -249,13 +249,11 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider { if (annotation == null) return errorsString(); String signature = KotlinSignatureUtil.getKotlinSignature(annotation); - String text = "Alternative Kotlin signature is available for this method:\n" - + StringUtil.escapeXml(signature); + String text = "Alternative Kotlin signature is available for this method:\n" + StringUtil.escapeXml(signature); if (errors == null) { return text; } - return text + "\nIt has the following " + StringUtil.pluralize("error", errors.size()) + ":\n" - + errorsString(); + return text + "\nIt has the following " + StringUtil.pluralize("error", errors.size()) + ":\n" + errorsString(); } @NotNull