style: detekt

Author: BFergerson

detekt.yml

@@ -2,7 +2,7 @@
 # https://github.com/detekt/detekt/blob/master/detekt-core/src/main/resources/default-detekt-config.yml
 
 build:
-  maxIssues: 22 #todo: zero out
+  maxIssues: 18 #todo: zero out
 
 formatting:
   Indentation:

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactCreationService.kt

@@ -46,6 +46,7 @@ import java.util.*
  * @since 0.4.0
  * @author [Brandon Fergerson](mailto:bfergerson@apache.org)
  */
+@Suppress("TooManyFunctions") // public API
 class JVMArtifactCreationService : IArtifactCreationService {
 
     companion object {

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactMarkService.kt

@@ -25,6 +25,7 @@ import com.intellij.ui.treeStructure.SimpleNode
 import spp.jetbrains.marker.SourceMarkerUtils
 import spp.jetbrains.marker.jvm.presentation.JVMVariableNode
 import spp.jetbrains.marker.jvm.service.utils.JVMMarkerUtils
+import spp.jetbrains.marker.service.ArtifactTypeService
 import spp.jetbrains.marker.service.define.IArtifactMarkService
 import spp.jetbrains.marker.source.mark.api.SourceMark
 import spp.jetbrains.marker.source.mark.inlay.config.InlayMarkVirtualText
@@ -64,13 +65,13 @@ class JVMArtifactMarkService : IArtifactMarkService {
                 )
             }
         } else {
-            if (JVMMarkerUtils.isJvmMethod(statement.parent)) {
+            if (ArtifactTypeService.isFunction(statement.parent)) {
                 virtualText.spacingTillMethodText = SourceMarkerUtils.getPrefixSpacingCount(statement.parent)
             }
 
             var startOffset = statement.textRange.startOffset
             if (virtualText.showBeforeAnnotationsWhenBlock) {
-                if (JVMMarkerUtils.isJvmMethod(statement.parent)) {
+                if (ArtifactTypeService.isFunction(statement.parent)) {
                     val annotations = JVMMarkerUtils.getMethodAnnotations(statement.parent)
                     if (annotations.isNotEmpty()) {
                         startOffset = annotations[0].textRange.startOffset

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/utils/JVMMarkerUtils.kt

@@ -64,7 +64,8 @@ object JVMMarkerUtils {
             )?.let { getFullyQualifiedName(it) }
         }
         if (parentIdentifier == null) {
-            error("Could not determine parent of element: $element") //todo: extension function, see SourceMarkerConfig, make test, groovy import statements
+            //todo: extension function, see SourceMarkerConfig, make test, groovy import statements
+            error("Could not determine parent of element: $element")
         }
 
         element.textRange.startOffset.let {
@@ -130,13 +131,7 @@ object JVMMarkerUtils {
         )
     }
 
-    fun isJvmMethod(element: PsiElement): Boolean {
-        return element is PsiMethod || element is KtFunction
-    }
-
     fun getMethodAnnotations(element: PsiElement): List<PsiElement> {
-        require(isJvmMethod(element)) { "Element is not a JVM method: $element" }
-
         return when (element) {
             is PsiMethod -> element.annotations.toList()
             is KtFunction -> element.annotationEntries

marker/src/main/kotlin/spp/jetbrains/marker/plugin/SourceInlayHintProvider.kt

@@ -24,6 +24,7 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors.INLINE_PARAMETER_HINT
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.Inlay
 import com.intellij.openapi.editor.colors.EditorFontType
 import com.intellij.openapi.editor.impl.EditorImpl
 import com.intellij.openapi.editor.markup.EffectType
@@ -36,6 +37,7 @@ import com.intellij.ui.paint.EffectPainter
 import org.joor.Reflect
 import spp.jetbrains.marker.SourceMarker
 import spp.jetbrains.marker.service.ArtifactMarkService
+import spp.jetbrains.marker.source.mark.api.SourceMark
 import spp.jetbrains.marker.source.mark.api.event.SourceMarkEventCode.MARK_REMOVED
 import spp.jetbrains.marker.source.mark.api.event.SourceMarkEventListener
 import spp.jetbrains.marker.source.mark.api.key.SourceKey
@@ -100,20 +102,7 @@ class SourceInlayHintProvider : InlayHintsProvider<NoSettings> {
                         FileEditorManager.getInstance(event.sourceMark.project).selectedTextEditor?.inlayModel
                             //todo: smaller range
                             ?.getBlockElementsInRange(0, Integer.MAX_VALUE)?.forEach {
-                                if (it.renderer is BlockInlayRenderer) {
-                                    val cachedPresentation = Reflect.on(it.renderer).field("cachedPresentation").get<Any>()
-                                    if (cachedPresentation is RecursivelyUpdatingRootPresentation) {
-                                        if (cachedPresentation.content is StaticDelegatePresentation) {
-                                            val delegatePresentation = cachedPresentation.content as StaticDelegatePresentation
-                                            if (delegatePresentation.presentation is DynamicTextInlayPresentation) {
-                                                val dynamicPresentation = delegatePresentation.presentation as DynamicTextInlayPresentation
-                                                if (dynamicPresentation.inlayMark == event.sourceMark) {
-                                                    Disposer.dispose(it)
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
+                                disposeInlayIfNecessary(it, event.sourceMark)
                             }
 
                         InlayHintsPassFactory.forceHintsUpdateOnNextPass()
@@ -122,6 +111,23 @@ class SourceInlayHintProvider : InlayHintsProvider<NoSettings> {
             }
         }
 
+        private fun disposeInlayIfNecessary(it: Inlay<*>, sourceMark: SourceMark) {
+            if (it.renderer is BlockInlayRenderer) {
+                val cachedPresentation = Reflect.on(it.renderer).field("cachedPresentation").get<Any>()
+                if (cachedPresentation is RecursivelyUpdatingRootPresentation) {
+                    if (cachedPresentation.content is StaticDelegatePresentation) {
+                        val delegatePresentation = cachedPresentation.content as StaticDelegatePresentation
+                        if (delegatePresentation.presentation is DynamicTextInlayPresentation) {
+                            val dynamicPresentation = delegatePresentation.presentation as DynamicTextInlayPresentation
+                            if (dynamicPresentation.inlayMark == sourceMark) {
+                                Disposer.dispose(it)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
         @Volatile
         @JvmField
         var latestInlayMarkAddedAt: Long = -1L