Clean up and finalized companion object main resolving. Also adding

test resource that was not added earlier.

Author: themkat

server/src/main/kotlin/org/javacs/kt/resolve/ResolveMain.kt

@@ -5,11 +5,7 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtObjectDeclaration
-import org.jetbrains.kotlin.psi.psiUtil.anyDescendantOfType
-import org.jetbrains.kotlin.psi.KtClassOrObject
-import org.jetbrains.kotlin.container.topologicalSort
 import org.javacs.kt.CompiledFile
-import org.javacs.kt.LOG
 import org.javacs.kt.position.range
 import org.javacs.kt.util.partitionAroundLast
 import com.intellij.openapi.util.TextRange
@@ -29,7 +25,6 @@ fun resolveMain(file: CompiledFile): Map<String,Any> {
 
     val companionMain = findCompanionObjectMain(parsedFile)
     if(null != companionMain) {
-        // TODO: any way we should handle the jvmname stuff here?
         return mapOf(
             "mainClass" to (companionMain.first ?: ""),
             "range" to range(file.content, companionMain.second)
@@ -39,15 +34,13 @@ fun resolveMain(file: CompiledFile): Map<String,Any> {
     return emptyMap()
 }
 
-// only one allowed (so invalid syntax files will not show any main methods)
+// only one main method allowed top level in a file (so invalid syntax files will not show any main methods)
 private fun findTopLevelMainFunction(file: KtFile): Pair<String?, TextRange>? = file.declarations.find {
-    // TODO: any validations on arguments
     it is KtNamedFunction && "main" == it.name
 }?.let {
     Pair(it.name, it.textRangeInParent)
 }
 
-// TODO: can this and the previous be merged in any way? or is this approach the cleanest?
 // finds a top level class that contains a companion object with a main function inside
 private fun findCompanionObjectMain(file: KtFile): Pair<String?, TextRange>? = file.declarations.flatMap { topLevelDeclaration ->
     if(topLevelDeclaration is KtClass) {
@@ -58,16 +51,12 @@ private fun findCompanionObjectMain(file: KtFile): Pair<String?, TextRange>? = f
 }.flatMap {    companionObject ->
     companionObject.body?.children?.toList() ?: emptyList()
 }.mapNotNull {  companionObjectInternal ->
-    if(companionObjectInternal is KtNamedFunction && "main" == companionObjectInternal.name) { // && companionObjectInternal.annotations.any {
-            //     LOG.info("Annotation!! {}", it.name)
-            //     "JvmStatic" == it.name
-            // }
+    if(companionObjectInternal is KtNamedFunction && "main" == companionObjectInternal.name && companionObjectInternal.text.startsWith("@JvmStatic")) {
         companionObjectInternal
     } else {
         null
     }
 }.firstOrNull()?.let {
     // a little ugly, but because of success of the above, we know that "it" has 4 layers of parent objects (child of companion object body, companion object body, companion object, outer class)
-    // TODO: should we correct textRange start line manually? includes the JvmStatic annotation if present..
     Pair((it.parent.parent.parent.parent as KtClass).fqName?.toString(), it.textRange)
 }

server/src/test/kotlin/org/javacs/kt/ResolveMainCommandTest.kt

@@ -70,7 +70,7 @@ class CompanionObjectMainResolve : SingleFileTestFixture("resolvemain", "Compani
         assertNotNull(commandResult)
         val mainInfo = commandResult as Map<String, Any>
         assertEquals("test.my.companion.SweetPotato", mainInfo["mainClass"])
-        assertEquals(Range(Position(9, 8), Position(11, 9)), mainInfo["range"])
+        assertEquals(Range(Position(8, 8), Position(11, 9)), mainInfo["range"])
         assertEquals(root.toString(), mainInfo["projectRoot"])
     }
 }

server/src/test/resources/resolvemain/CompanionObject.kt

@@ -0,0 +1,14 @@
+package test.my.companion
+
+val SOME_GLOBAL_CONSTANT = 42
+
+fun multiplyByOne(num: Int) = num*1
+
+class SweetPotato {
+    companion object {
+        @JvmStatic
+        fun main() {
+            println("42 multiplied by 1: ${multiplyByOne(42)}")
+        }
+    }
+}