Moved main resolve logic to protocol extensions instead of commands

themkat · themkat · commit 572643e96aa9 · 2022-04-25T17:19:47.000+02:00
diff --git a/server/src/main/kotlin/org/javacs/kt/KotlinLanguageServer.kt b/server/src/main/kotlin/org/javacs/kt/KotlinLanguageServer.kt
@@ -30,7 +30,7 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
 
     private val textDocuments = KotlinTextDocumentService(sourceFiles, sourcePath, config, tempDirectory, uriContentProvider, classPath)
     private val workspaces = KotlinWorkspaceService(sourceFiles, sourcePath, classPath, textDocuments, config)
-    private val protocolExtensions = KotlinProtocolExtensionService(uriContentProvider, classPath)
+    private val protocolExtensions = KotlinProtocolExtensionService(uriContentProvider, classPath, sourcePath)
 
     private lateinit var client: LanguageClient
 
diff --git a/server/src/main/kotlin/org/javacs/kt/KotlinProtocolExtensionService.kt b/server/src/main/kotlin/org/javacs/kt/KotlinProtocolExtensionService.kt
@@ -3,11 +3,14 @@ package org.javacs.kt
 import org.eclipse.lsp4j.*
 import org.javacs.kt.util.AsyncExecutor
 import org.javacs.kt.util.parseURI
+import org.javacs.kt.resolve.resolveMain
 import java.util.concurrent.CompletableFuture
+import java.nio.file.Paths
 
 class KotlinProtocolExtensionService(
     private val uriContentProvider: URIContentProvider,
-    private val cp: CompilerClassPath
+    private val cp: CompilerClassPath,
+    private val sp: SourcePath
 ) : KotlinProtocolExtensions {
     private val async = AsyncExecutor()
 
@@ -18,4 +21,22 @@ class KotlinProtocolExtensionService(
     override fun buildOutputLocation(): CompletableFuture<String?> = async.compute {
         cp.outputDirectory.absolutePath
     }
+
+    override fun mainClass(textDocument: TextDocumentIdentifier): CompletableFuture<Map<String, Any?>> = async.compute {
+        val fileUri = parseURI(textDocument.uri)
+        val filePath = Paths.get(fileUri)
+        
+        // we find the longest one in case both the root and submodule are included
+        val workspacePath = cp.workspaceRoots.filter {
+            filePath.startsWith(it)
+        }.map {
+            it.toString()
+        }.maxByOrNull(String::length) ?: ""
+        
+        val compiledFile = sp.currentVersion(fileUri)
+
+        resolveMain(compiledFile) + mapOf(
+            "projectRoot" to workspacePath
+        )
+    }
 }
diff --git a/server/src/main/kotlin/org/javacs/kt/KotlinProtocolExtensions.kt b/server/src/main/kotlin/org/javacs/kt/KotlinProtocolExtensions.kt
@@ -12,4 +12,7 @@ interface KotlinProtocolExtensions {
 
     @JsonRequest
     fun buildOutputLocation(): CompletableFuture<String?>
+
+    @JsonRequest
+    fun mainClass(textDocument: TextDocumentIdentifier): CompletableFuture<Map<String, Any?>>
 }
diff --git a/server/src/main/kotlin/org/javacs/kt/KotlinWorkspaceService.kt b/server/src/main/kotlin/org/javacs/kt/KotlinWorkspaceService.kt
@@ -8,13 +8,11 @@ import org.eclipse.lsp4j.services.LanguageClientAware
 import org.eclipse.lsp4j.jsonrpc.messages.Either
 import org.javacs.kt.symbols.workspaceSymbols
 import org.javacs.kt.command.JAVA_TO_KOTLIN_COMMAND
-import org.javacs.kt.command.RESOLVE_MAIN
 import org.javacs.kt.j2k.convertJavaToKotlin
 import org.javacs.kt.KotlinTextDocumentService
 import org.javacs.kt.position.extractRange
 import org.javacs.kt.util.filePath
 import org.javacs.kt.util.parseURI
-import org.javacs.kt.util.AsyncExecutor
 import org.javacs.kt.resolve.resolveMain
 import java.net.URI
 import java.nio.file.Paths
@@ -32,9 +30,7 @@ class KotlinWorkspaceService(
 ) : WorkspaceService, LanguageClientAware {
     private val gson = Gson()
     private var languageClient: LanguageClient? = null
-
-    private val async = AsyncExecutor()
-    
+ 
     override fun connect(client: LanguageClient): Unit {
         languageClient = client
     }
@@ -58,26 +54,6 @@ class KotlinWorkspaceService(
                     )
                 )))))
             }
-
-            RESOLVE_MAIN -> {
-                val fileUri = parseURI(gson.fromJson(args[0] as JsonElement, String::class.java))
-                val filePath = Paths.get(fileUri)
-
-                // we find the longest one in case both the root and submodule are included
-                val workspacePath = cp.workspaceRoots.filter {
-                    filePath.startsWith(it)
-                }.map {
-                    it.toString()
-                }.maxByOrNull(String::length) ?: ""
-                
-                val compiledFile = sp.currentVersion(fileUri)
-
-                return async.compute {
-                    resolveMain(compiledFile) + mapOf(
-                        "projectRoot" to workspacePath
-                    )
-                }
-            }
         }
 
         return CompletableFuture.completedFuture(null)
diff --git a/server/src/test/kotlin/org/javacs/kt/ResolveMainTest.kt b/server/src/test/kotlin/org/javacs/kt/ResolveMainTest.kt
@@ -4,22 +4,22 @@ import com.google.gson.Gson
 import org.eclipse.lsp4j.ExecuteCommandParams
 import org.eclipse.lsp4j.Position
 import org.eclipse.lsp4j.Range
+import org.eclipse.lsp4j.TextDocumentIdentifier
 import org.junit.Test
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
-import org.javacs.kt.command.RESOLVE_MAIN
 
 class NoMainResolve : SingleFileTestFixture("resolvemain", "NoMain.kt") {
     @Test
     fun `Should not find any main class info`() {
         val root = testResourcesRoot().resolve(workspaceRoot)
-        val executeCommandParams = ExecuteCommandParams(RESOLVE_MAIN, listOf(Gson().toJsonTree(root.resolve(file).toUri().toString(), )))
+        val fileUri = root.resolve(file).toUri().toString()
         
-        val commandResult = languageServer.workspaceService.executeCommand(executeCommandParams).get()
+        val result = languageServer.getProtocolExtensionService().mainClass(TextDocumentIdentifier(fileUri)).get()
 
-        assertNotNull(commandResult)
-        val mainInfo = commandResult as Map<String, String>
+        assertNotNull(result)
+        val mainInfo = result as Map<String, String>
         assertNull(mainInfo["mainClass"])
         assertEquals(root.toString(), mainInfo["projectRoot"])
     }
@@ -30,12 +30,12 @@ class SimpleMainResolve : SingleFileTestFixture("resolvemain", "Simple.kt") {
     @Test
     fun `Should resolve correct main class of simple file`() {
         val root = testResourcesRoot().resolve(workspaceRoot)
-        val executeCommandParams = ExecuteCommandParams(RESOLVE_MAIN, listOf(Gson().toJsonTree(root.resolve(file).toUri().toString())))
+        val fileUri = root.resolve(file).toUri().toString()
         
-        val commandResult = languageServer.workspaceService.executeCommand(executeCommandParams).get()
+        val result = languageServer.getProtocolExtensionService().mainClass(TextDocumentIdentifier(fileUri)).get()
 
-        assertNotNull(commandResult)
-        val mainInfo = commandResult as Map<String, Any>
+        assertNotNull(result)
+        val mainInfo = result as Map<String, Any>
         assertEquals("test.SimpleKt", mainInfo["mainClass"])
         assertEquals(Range(Position(2, 0), Position(4, 1)), mainInfo["range"])
         assertEquals(root.toString(), mainInfo["projectRoot"])
@@ -47,12 +47,12 @@ class JvmNameAnnotationMainResolve : SingleFileTestFixture("resolvemain", "JvmNa
     @Test
     fun `Should resolve correct main class of file annotated with JvmName`() {
         val root = testResourcesRoot().resolve(workspaceRoot)
-        val executeCommandParams = ExecuteCommandParams(RESOLVE_MAIN, listOf(Gson().toJsonTree(root.resolve(file).toUri().toString())))
+        val fileUri = root.resolve(file).toUri().toString()
         
-        val commandResult = languageServer.workspaceService.executeCommand(executeCommandParams).get()
+        val result = languageServer.getProtocolExtensionService().mainClass(TextDocumentIdentifier(fileUri)).get()
 
-        assertNotNull(commandResult)
-        val mainInfo = commandResult as Map<String, Any>
+        assertNotNull(result)
+        val mainInfo = result as Map<String, Any>
         assertEquals("com.mypackage.name.Potato", mainInfo["mainClass"])
         assertEquals(Range(Position(5, 0), Position(7, 1)), mainInfo["range"])
         assertEquals(root.toString(), mainInfo["projectRoot"])
@@ -63,12 +63,12 @@ class CompanionObjectMainResolve : SingleFileTestFixture("resolvemain", "Compani
     @Test
     fun `Should resolve correct main class of main function inside companion object`() {
         val root = testResourcesRoot().resolve(workspaceRoot)
-        val executeCommandParams = ExecuteCommandParams(RESOLVE_MAIN, listOf(Gson().toJsonTree(root.resolve(file).toUri().toString())))
+        val fileUri = root.resolve(file).toUri().toString()
         
-        val commandResult = languageServer.workspaceService.executeCommand(executeCommandParams).get()
+        val result = languageServer.getProtocolExtensionService().mainClass(TextDocumentIdentifier(fileUri)).get()
 
-        assertNotNull(commandResult)
-        val mainInfo = commandResult as Map<String, Any>
+        assertNotNull(result)
+        val mainInfo = result as Map<String, Any>
         assertEquals("test.my.companion.SweetPotato", mainInfo["mainClass"])
         assertEquals(Range(Position(8, 8), Position(11, 9)), mainInfo["range"])
         assertEquals(root.toString(), mainInfo["projectRoot"])

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,7 @@ interface KotlinProtocolExtensions {`
`12`	`12`
`13`	`13`	`@JsonRequest`
`14`	`14`	`fun buildOutputLocation(): CompletableFuture<String?>`
	`15`	`+`
	`16`	`+ @JsonRequest`
	`17`	`+ fun mainClass(textDocument: TextDocumentIdentifier): CompletableFuture<Map<String, Any?>>`
`15`	`18`	`}`