From 682fc042b07aa110cde7e3157a3527a4ec752014 Mon Sep 17 00:00:00 2001
From: "Roman.Ivanov" <Roman.Ivanov@jetbrains.com>
Date: Tue, 11 Jun 2019 11:03:02 +0700
Subject: [PATCH] InlayHints: cleanup

GitOrigin-RevId: da9e14b390e6530d5d554079ed329f75c674809a
---
 .../hints/AnnotationInlayProvider.kt          | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/hints/AnnotationInlayProvider.kt b/java/java-impl/src/com/intellij/codeInsight/hints/AnnotationInlayProvider.kt
index b4e7f49e2c53..d463786af199 100644
--- a/java/java-impl/src/com/intellij/codeInsight/hints/AnnotationInlayProvider.kt
+++ b/java/java-impl/src/com/intellij/codeInsight/hints/AnnotationInlayProvider.kt
@@ -40,18 +40,10 @@ class AnnotationInlayProvider : InlayHintsProvider<AnnotationInlayProvider.Setti
             if (nameReferenceElement != null && element.modifierList != null &&
                 (shownAnnotations.add(nameReferenceElement.qualifiedName) || JavaDocInfoGenerator.isRepeatableAnnotationType(it))) {
               val offset = element.modifierList!!.textRange.startOffset
-              val presentation = annotationPresentation(it)
-              val menuOnClick = MenuOnClickPresentation(presentation, project) {
-                val makeExplicit = InsertAnnotationAction(project, file, element)
-                listOf(
-                  makeExplicit,
-                  ToggleSettingsAction("Turn off external annotations", settings::showExternal),
-                  ToggleSettingsAction("Turn off inferred annotations", settings::showInferred)
-                )
-              }
+              val presentation = createPresentation(it, element)
               when (element) {
-                is PsiMethod -> sink.addBlockElement(offset, true, true, 0, menuOnClick)
-                else -> sink.addInlineElement(offset, true, menuOnClick)
+                is PsiMethod -> sink.addBlockElement(offset, false, true, 0, presentation)
+                else -> sink.addInlineElement(offset, true, presentation)
               }
             }
           }
@@ -59,6 +51,21 @@ class AnnotationInlayProvider : InlayHintsProvider<AnnotationInlayProvider.Setti
         return true
       }
 
+      private fun createPresentation(
+        annotation: PsiAnnotation,
+        element: PsiModifierListOwner
+      ): MenuOnClickPresentation {
+        val presentation = annotationPresentation(annotation)
+        return MenuOnClickPresentation(presentation, project) {
+          val makeExplicit = InsertAnnotationAction(project, file, element)
+          listOf(
+            makeExplicit,
+            ToggleSettingsAction("Turn off external annotations", settings::showExternal),
+            ToggleSettingsAction("Turn off inferred annotations", settings::showInferred)
+          )
+        }
+      }
+
       private fun annotationPresentation(annotation: PsiAnnotation): InsetPresentation = with(factory) {
         val nameReferenceElement = annotation.nameReferenceElement
         val parameterList = annotation.parameterList