Merge pull request #628 from AlexandrosAlexiou/refactor/dependecies/decompiler

refactor: use JetBrains release repository for FernFlower decompiler

Author: fwcd

gradle/libs.versions.toml

@@ -4,6 +4,7 @@ lsp4jVersion = "0.21.2"
 exposedVersion = "0.37.3"
 jmhVersion = "1.37"
 guavaVersion = "33.4.0-jre"
+fernFlowerVersion = "243.22562.218"
 
 [libraries]
 org-jetbrains-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlinVersion" }
@@ -28,7 +29,7 @@ org-jetbrains-exposed-core = { module = "org.jetbrains.exposed:exposed-core", ve
 org-jetbrains-exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposedVersion" }
 org-jetbrains-exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposedVersion" }
 
-org-jetbrains-fernflower = { module = "org.jetbrains:fernflower", version = "1.0" }
+com-jetbrains-intellij-java-decompiler = { module = "com.jetbrains.intellij.java:java-decompiler-engine", version.ref = "fernFlowerVersion" }
 
 com-github-fwcd-ktfmt = { module = "com.github.fwcd.ktfmt:ktfmt", version = "b5d31d1" }
 

platform/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
         api(libs.org.jetbrains.kotlin.sam.with.receiver.compiler.plugin)
         api(libs.org.jetbrains.kotlin.reflect)
         api(libs.org.jetbrains.kotlin.jvm)
-        api(libs.org.jetbrains.fernflower)
+        api(libs.com.jetbrains.intellij.java.decompiler)
         api(libs.org.jetbrains.exposed.core)
         api(libs.org.jetbrains.exposed.dao)
         api(libs.org.jetbrains.exposed.jdbc)

server/build.gradle.kts

@@ -9,8 +9,9 @@ plugins {
     id("kotlin-language-server.kotlin-conventions")
 }
 
+val serverDebugPort = 4000
 val debugPort = 8000
-val debugArgs = "-agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=n,quiet=y"
+val debugArgs = "-agentlib:jdwp=transport=dt_socket,server=y,address=$debugPort,suspend=n,quiet=y"
 
 val serverMainClassName = "org.javacs.kt.MainKt"
 val applicationName = "kotlin-language-server"
@@ -19,16 +20,13 @@ application {
     mainClass.set(serverMainClassName)
     description = "Code completions, diagnostics and more for Kotlin"
     applicationDefaultJvmArgs = listOf("-DkotlinLanguageServer.version=$version")
-    applicationDistribution.into("bin") {
-        filePermissions { unix("755".toInt(radix = 8)) }
-    }
+    applicationDistribution.into("bin") { filePermissions { unix("755".toInt(radix = 8)) } }
 }
 
 repositories {
     maven(url = "https://repo.gradle.org/gradle/libs-releases")
-    maven { url = uri("$projectDir/lib") }
-    maven(uri("$projectDir/lib"))
     maven("https://jitpack.io")
+    maven(url = "https://www.jetbrains.com/intellij-repository/releases")
     mavenCentral()
 }
 
@@ -48,7 +46,7 @@ dependencies {
     implementation(kotlin("scripting-jvm-host-unshaded"))
     implementation(kotlin("sam-with-receiver-compiler-plugin"))
     implementation(kotlin("reflect"))
-    implementation(libs.org.jetbrains.fernflower)
+    implementation(libs.com.jetbrains.intellij.java.decompiler)
     implementation(libs.org.jetbrains.exposed.core)
     implementation(libs.org.jetbrains.exposed.dao)
     implementation(libs.org.jetbrains.exposed.jdbc)
@@ -79,9 +77,9 @@ tasks.register<Exec>("fixFilePermissions") {
 
     onlyIf { !System.getProperty("os.name").lowercase().contains("windows") }
     commandLine(
-            "chmod",
-            "+x",
-            "${tasks.installDist.get().destinationDir}/bin/kotlin-language-server"
+        "chmod",
+        "+x",
+        "${tasks.installDist.get().destinationDir}/bin/kotlin-language-server",
     )
 }
 
@@ -91,6 +89,8 @@ tasks.register<JavaExec>("debugRun") {
     standardInput = System.`in`
 
     jvmArgs(debugArgs)
+    args(listOf("--tcpServerPort", serverDebugPort, "--level", "trace", "--tcpDebug"))
+
     doLast { println("Using debug port $debugPort") }
 }
 

server/lib/fernflower-license.txt

@@ -23,9 +23,10 @@ import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CompletableFuture.completedFuture
 
 class KotlinLanguageServer(
-    val config: Configuration = Configuration()
+    val config: Configuration = Configuration(),
+    private val tcpDebug: Boolean = false
 ) : LanguageServer, LanguageClientAware, Closeable {
-    val databaseService = DatabaseService()
+    private val databaseService = DatabaseService()
     val classPath = CompilerClassPath(config.compiler, config.scripts, config.codegen, databaseService)
 
     private val tempDirectory = TemporaryDirectory()
@@ -56,7 +57,9 @@ class KotlinLanguageServer(
 
     override fun connect(client: LanguageClient) {
         this.client = client
-        connectLoggingBackend()
+        if (!tcpDebug) {
+            connectLoggingBackend()
+        }
 
         workspaces.connect(client)
         textDocuments.connect(client)

server/lib/gradle-kotlin-dsl-tooling-models-0.11.0-license.txt

@@ -7,21 +7,27 @@ import org.eclipse.lsp4j.launch.LSPLauncher
 import org.javacs.kt.util.ExitingInputStream
 import org.javacs.kt.util.tcpStartServer
 import org.javacs.kt.util.tcpConnectToClient
-
 class Args {
     /*
      * The language server can currently be launched in three modes:
      *  - Stdio, in which case no argument should be specified (used by default)
      *  - TCP Server, in which case the client has to connect to the specified tcpServerPort (used by the Docker image)
      *  - TCP Client, in which case the server will connect to the specified tcpClientPort/tcpClientHost (optionally used by VSCode)
      */
-
     @Parameter(names = ["--tcpServerPort", "-sp"])
     var tcpServerPort: Int? = null
+
     @Parameter(names = ["--tcpClientPort", "-p"])
     var tcpClientPort: Int? = null
+
     @Parameter(names = ["--tcpClientHost", "-h"])
     var tcpClientHost: String = "localhost"
+
+    @Parameter(names = ["--level"])
+    var logLevel: String = "info"
+
+    @Parameter(names = ["--tcpDebug"])
+    var tcpDebug: Boolean = false
 }
 
 fun main(argv: Array<String>) {
@@ -39,7 +45,8 @@ fun main(argv: Array<String>) {
         tcpStartServer(it)
     } ?: Pair(System.`in`, System.out)
 
-    val server = KotlinLanguageServer()
+    LOG.setLogLevel(args.logLevel)
+    val server = KotlinLanguageServer(tcpDebug = args.tcpDebug)
     val threads = Executors.newSingleThreadExecutor { Thread(it, "client") }
     val launcher = LSPLauncher.createServerLauncher(server, ExitingInputStream(inStream), outStream, threads) { it }
 

server/lib/org/jetbrains/fernflower/1.0/fernflower-1.0.jar

@@ -21,7 +21,7 @@ class ClassContentProvider(
     private val cp: CompilerClassPath,
     private val tempDir: TemporaryDirectory,
     private val sourceArchiveProvider: SourceArchiveProvider,
-    private val decompiler: Decompiler = FernflowerDecompiler()
+    private val decompiler: Decompiler = FernFlowerDecompiler()
 ) {
     /** Maps recently used (source-)KLS-URIs to their source contents (e.g. decompiled code) and the file extension. */
     private val cachedContents = object : LinkedHashMap<String, Pair<String, String>>() {