refactor: rename ArtifactType.Method to ArtifactType.Function

Author: BFergerson

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

@@ -72,7 +72,7 @@ object ArtifactScopeService : AbstractSourceMarkerService<IArtifactScopeService>
     }
 
     fun isOnFunction(qualifiedName: ArtifactQualifiedName): Boolean {
-        return qualifiedName.type == ArtifactType.METHOD
+        return qualifiedName.type == ArtifactType.FUNCTION
     }
 
     override fun isInsideFunction(element: PsiElement): Boolean {

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

@@ -50,7 +50,7 @@ object ArtifactTypeService : AbstractSourceMarkerService<IArtifactTypeService>()
     }
 
     fun isFunction(element: PsiElement): Boolean {
-        return getType(element) == ArtifactType.METHOD
+        return getType(element) == ArtifactType.FUNCTION
     }
 
     fun isPython(element: PsiElement): Boolean {

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

@@ -88,7 +88,7 @@ class JavascriptArtifactNamingService : IArtifactNamingService {
             is JSFunctionExpression -> getStatementOrExpressionQualifiedName(element, ArtifactType.EXPRESSION)
             is JSFunction -> ArtifactQualifiedName(
                 element.containingFile.virtualFile.path + ":" + element.qualifiedName!! + "()",
-                type = ArtifactType.METHOD,
+                type = ArtifactType.FUNCTION,
                 lineNumber = SourceMarkerUtils.getLineNumber(element)
             )
 

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

@@ -40,7 +40,7 @@ class JavascriptArtifactTypeService : IArtifactTypeService {
     override fun getType(element: PsiElement): ArtifactType? {
         return when (element) {
             is JSClass -> ArtifactType.CLASS
-            is JSFunction -> ArtifactType.METHOD
+            is JSFunction -> ArtifactType.FUNCTION
             is JSExpression -> ArtifactType.EXPRESSION
 
             else -> null

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

@@ -67,10 +67,10 @@ class JVMArtifactTypeService : IArtifactTypeService {
     override fun getType(element: PsiElement): ArtifactType? {
         return when {
             element is PsiClass -> ArtifactType.CLASS
-            element is PsiMethod -> ArtifactType.METHOD
+            element is PsiMethod -> ArtifactType.FUNCTION
             element is PsiExpression -> ArtifactType.EXPRESSION
             ArtifactTypeService.isKotlin(element) && element is KtClass -> ArtifactType.CLASS
-            ArtifactTypeService.isKotlin(element) && element is KtFunction -> ArtifactType.METHOD
+            ArtifactTypeService.isKotlin(element) && element is KtFunction -> ArtifactType.FUNCTION
             ArtifactTypeService.isKotlin(element) && element is KtExpression -> ArtifactType.EXPRESSION
             else -> null
         }

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

@@ -118,7 +118,7 @@ object JVMMarkerUtils {
         }
         return ArtifactQualifiedName(
             "$classQualifiedName.${getQualifiedName(method)}",
-            type = ArtifactType.METHOD,
+            type = ArtifactType.FUNCTION,
             lineNumber = method.nameIdentifier?.let { SourceMarkerUtils.getLineNumber(it) }
         )
     }
@@ -129,7 +129,7 @@ object JVMMarkerUtils {
         }
         return ArtifactQualifiedName(
             "$classQualifiedName.${getQualifiedName(method)}",
-            type = ArtifactType.METHOD,
+            type = ArtifactType.FUNCTION,
             lineNumber = method.nameIdentifier?.let { SourceMarkerUtils.getLineNumber(it) }
         )
     }

marker/jvm-marker/src/test/kotlin/spp/jetbrains/marker/jvm/JVMArtifactNamingServiceTest.kt

@@ -177,13 +177,13 @@ class JVMArtifactNamingServiceTest : BasePlatformTestCase() {
         val foo1 = methods[0]
         val name = JVMArtifactNamingService().getFullyQualifiedName(foo1)
         assertEquals("$className.foo1()", name.identifier)
-        assertEquals(ArtifactType.METHOD, name.type)
+        assertEquals(ArtifactType.FUNCTION, name.type)
         assertNotNull(name.lineNumber)
 
         val foo2 = methods[1]
         val name2 = JVMArtifactNamingService().getFullyQualifiedName(foo2)
         assertEquals("$className.foo2(java.lang.String)", name2.identifier)
-        assertEquals(ArtifactType.METHOD, name2.type)
+        assertEquals(ArtifactType.FUNCTION, name2.type)
         assertNotNull(name2.lineNumber)
 
         val foo3 = methods[2]
@@ -192,13 +192,13 @@ class JVMArtifactNamingServiceTest : BasePlatformTestCase() {
             "$className.foo3(java.lang.String,int,long,double,float,boolean,char,byte,short)",
             name3.identifier
         )
-        assertEquals(ArtifactType.METHOD, name3.type)
+        assertEquals(ArtifactType.FUNCTION, name3.type)
         assertNotNull(name3.lineNumber)
 
         val foo4 = methods[3]
         val name4 = JVMArtifactNamingService().getFullyQualifiedName(foo4)
         assertEquals("$className.foo4($className\$MyObject)", name4.identifier)
-        assertEquals(ArtifactType.METHOD, name4.type)
+        assertEquals(ArtifactType.FUNCTION, name4.type)
         assertNotNull(name4.lineNumber)
 
         val foo5 = methods[4]
@@ -207,7 +207,7 @@ class JVMArtifactNamingServiceTest : BasePlatformTestCase() {
             "$className.foo5(java.lang.String[],int[],long[],double[],float[],boolean[],char[],byte[],short[])",
             name5.identifier
         )
-        assertEquals(ArtifactType.METHOD, name5.type)
+        assertEquals(ArtifactType.FUNCTION, name5.type)
         assertNotNull(name5.lineNumber)
     }
 
@@ -226,7 +226,7 @@ class JVMArtifactNamingServiceTest : BasePlatformTestCase() {
 
         val name = JVMArtifactNamingService().getFullyQualifiedName(method!!)
         assertEquals("$className\$ClassName.foo()", name.identifier)
-        assertEquals(ArtifactType.METHOD, name.type)
+        assertEquals(ArtifactType.FUNCTION, name.type)
         assertNotNull(name.lineNumber)
     }
 

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

@@ -74,7 +74,7 @@ class PythonArtifactNamingService : IArtifactNamingService {
                 ArtifactQualifiedName(
                     "$qualifiedName()",
                     null,
-                    ArtifactType.METHOD,
+                    ArtifactType.FUNCTION,
                     lineNumber = SourceMarkerUtils.getLineNumber(element)
                 )
             }

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

@@ -51,7 +51,7 @@ class PythonArtifactTypeService : IArtifactTypeService {
     override fun getType(element: PsiElement): ArtifactType? {
         return when (element) {
             is PyClass -> ArtifactType.CLASS
-            is PyFunction -> ArtifactType.METHOD
+            is PyFunction -> ArtifactType.FUNCTION
             is PyExpression -> ArtifactType.EXPRESSION
 
             else -> null

marker/src/main/kotlin/spp/jetbrains/marker/source/mark/inlay/ExpressionInlayMark.kt

@@ -43,7 +43,7 @@ class ExpressionInlayMark constructor(
 
     init {
         //show above element by default for method and class artifacts
-        if (artifactQualifiedName.type in listOf(ArtifactType.METHOD, ArtifactType.CLASS)) {
+        if (artifactQualifiedName.type in listOf(ArtifactType.FUNCTION, ArtifactType.CLASS)) {
             showAboveExpression = true
         }
     }