fix: remove jvm-specific imports

ref: sourceplusplus/sourceplusplus#928

Author: BFergerson

common/src/main/kotlin/spp/jetbrains/artifact/service/ArtifactTypeService.kt

@@ -30,6 +30,14 @@ object ArtifactTypeService : AbstractSourceMarkerService<IArtifactTypeService>()
         return getService(element.language).getNameIdentifier(element)
     }
 
+    override fun getAnnotations(element: PsiElement): List<PsiElement> {
+        return getService(element.language).getAnnotations(element)
+    }
+
+    override fun getAnnotationOwnerIfAnnotation(element: PsiElement): PsiElement? {
+        return getService(element.language).getAnnotationOwnerIfAnnotation(element)
+    }
+
     override fun getAnnotationOwnerIfAnnotation(element: PsiElement, line: Int): PsiElement? {
         return getService(element.language).getAnnotationOwnerIfAnnotation(element, line)
     }

common/src/main/kotlin/spp/jetbrains/artifact/service/define/IArtifactTypeService.kt

@@ -27,6 +27,8 @@ interface IArtifactTypeService : ISourceMarkerService {
      * Necessary because Groovy uses [LightIdentifier] for the name identifier.
      */
     fun getNameIdentifier(element: PsiElement): PsiElement = element
+    fun getAnnotations(element: PsiElement): List<PsiElement>
+    fun getAnnotationOwnerIfAnnotation(element: PsiElement): PsiElement?
     fun getAnnotationOwnerIfAnnotation(element: PsiElement, line: Int): PsiElement?
     fun isComment(element: PsiElement): Boolean
     fun getType(element: PsiElement): ArtifactType?

marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactTypeService.kt

@@ -31,6 +31,14 @@ import spp.protocol.artifact.ArtifactType
  */
 class JavascriptArtifactTypeService : IArtifactTypeService {
 
+    override fun getAnnotations(element: PsiElement): List<PsiElement> {
+        return emptyList() //todo: implement
+    }
+
+    override fun getAnnotationOwnerIfAnnotation(element: PsiElement): PsiElement? {
+        return null //todo: implement
+    }
+
     override fun getAnnotationOwnerIfAnnotation(element: PsiElement, line: Int): PsiElement? {
         return null //todo: implement
     }

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

@@ -45,6 +45,19 @@ class JVMArtifactTypeService : IArtifactTypeService {
         } else element
     }
 
+    override fun getAnnotations(element: PsiElement): List<PsiElement> {
+        return (element as? PsiModifierListOwner)?.annotations?.toList() ?: emptyList()
+    }
+
+    override fun getAnnotationOwnerIfAnnotation(element: PsiElement): PsiElement? {
+        if (element is PsiAnnotation) {
+            if (element.owner is PsiModifierList) {
+                return (element.owner as PsiModifierList).parent
+            }
+        }
+        return null
+    }
+
     override fun getAnnotationOwnerIfAnnotation(element: PsiElement, line: Int): PsiElement? {
         val annotation = element.parentOfType<PsiAnnotation>()
         if (annotation != null && getLineNumber(annotation) == line) {

marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactTypeService.kt

@@ -32,6 +32,17 @@ import spp.protocol.artifact.ArtifactType
  */
 class PythonArtifactTypeService : IArtifactTypeService {
 
+    override fun getAnnotations(element: PsiElement): List<PsiElement> {
+        return emptyList() //todo: implement
+    }
+
+    override fun getAnnotationOwnerIfAnnotation(element: PsiElement): PsiElement? {
+        if (element is PyDecorator) {
+            return element.target
+        }
+        return null
+    }
+
     override fun getAnnotationOwnerIfAnnotation(element: PsiElement, line: Int): PsiElement? {
         if (element is PyDecorator && getLineNumber(element) == line) {
             return element.target

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

@@ -19,10 +19,13 @@ package spp.jetbrains.marker.plugin
 import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
 import com.intellij.codeInsight.daemon.LineMarkerInfo
 import com.intellij.codeInsight.daemon.LineMarkerProviderDescriptor
-import com.intellij.psi.*
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiNameIdentifierOwner
 import com.intellij.util.Function
+import spp.jetbrains.artifact.service.ArtifactTypeService
 import spp.jetbrains.marker.SourceMarker
 import spp.jetbrains.marker.service.ArtifactMarkService
+import spp.jetbrains.marker.source.SourceFileMarker
 import spp.jetbrains.marker.source.mark.gutter.GutterMark
 
 /**
@@ -34,19 +37,20 @@ import spp.jetbrains.marker.source.mark.gutter.GutterMark
 class SourceLineMarkerProvider : LineMarkerProviderDescriptor() {
 
     override fun getLineMarkerInfo(element: PsiElement): LineMarkerInfo<PsiElement>? {
-        if (element is PsiAnnotation && element.owner is PsiModifierList) {
-            val owner = element.owner as PsiModifierList
-            if (owner.parent is PsiNameIdentifierOwner) {
-                val gutterMark = (owner.parent as PsiNameIdentifierOwner).nameIdentifier
-                    ?.getUserData(GutterMark.KEY)
-                if (gutterMark?.configuration?.preferShowOnAnnotations == true) {
-                    return getLineMarkerInfo(gutterMark, element)
-                }
+        if (!SourceFileMarker.isFileSupported(element.containingFile)) {
+            return null //not a supported file type
+        }
+
+        val annotationOwner = ArtifactTypeService.getAnnotationOwnerIfAnnotation(element)
+        if (annotationOwner is PsiNameIdentifierOwner) {
+            val gutterMark = annotationOwner.nameIdentifier?.getUserData(GutterMark.KEY)
+            if (gutterMark?.configuration?.preferShowOnAnnotations == true) {
+                return getLineMarkerInfo(gutterMark, element)
             }
         }
 
         val gutterMark = element.getUserData(GutterMark.KEY) ?: return null
-        val hasAnnotations = (gutterMark.getPsiElement() as? PsiModifierListOwner)?.annotations?.isNotEmpty() == true
+        val hasAnnotations = ArtifactTypeService.getAnnotations(gutterMark.getPsiElement()).isNotEmpty()
         return if (hasAnnotations && gutterMark.configuration.preferShowOnAnnotations) {
             null
         } else {