Refactor source archive providers

Author: daplf

server/src/main/kotlin/org/javacs/kt/KotlinLanguageServer.kt

@@ -7,8 +7,7 @@ import org.eclipse.lsp4j.services.LanguageClient
 import org.eclipse.lsp4j.services.LanguageClientAware
 import org.eclipse.lsp4j.services.LanguageServer
 import org.javacs.kt.command.ALL_COMMANDS
-import org.javacs.kt.externalsources.ClassContentProvider
-import org.javacs.kt.externalsources.ClassPathSourceArchiveProvider
+import org.javacs.kt.externalsources.*
 import org.javacs.kt.util.AsyncExecutor
 import org.javacs.kt.util.TemporaryDirectory
 import org.javacs.kt.util.parseURI
@@ -25,7 +24,7 @@ class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
     val classPath = CompilerClassPath(config.compiler)
 
     private val tempDirectory = TemporaryDirectory()
-    private val uriContentProvider = URIContentProvider(ClassContentProvider(config.externalSources, classPath, tempDirectory, ClassPathSourceArchiveProvider(classPath)))
+    private val uriContentProvider = URIContentProvider(ClassContentProvider(config.externalSources, classPath, tempDirectory, CompositeSourceArchiveProvider(JdkSourceArchiveProvider(classPath), ClassPathSourceArchiveProvider(classPath))))
     val sourcePath = SourcePath(classPath, uriContentProvider, config.indexing)
     val sourceFiles = SourceFiles(sourcePath, uriContentProvider)
 

server/src/main/kotlin/org/javacs/kt/externalsources/ClassPathSourceArchiveProvider.kt

@@ -1,29 +1,11 @@
 package org.javacs.kt.externalsources
 
 import org.javacs.kt.CompilerClassPath
-import java.io.File
 import java.nio.file.Path
-import java.nio.file.Paths
 
 class ClassPathSourceArchiveProvider(
     private val cp: CompilerClassPath
 ) : SourceArchiveProvider {
     override fun fetchSourceArchive(compiledArchive: Path): Path? =
-        getJdkSource(compiledArchive) ?: cp.classPath.firstOrNull { it.compiledJar == compiledArchive }?.sourceJar
-
-    /**
-     * Checks if the given path is inside the JDK. If it is, we return the corresponding source zip.
-     * Note that this method currently doesn't take into the account the JDK version, which means JDK source code
-     * is only available for JDK 9+ builds.
-     * TODO: improve this resolution logic to work for older JDK versions as well.
-     */
-    private fun getJdkSource(path: Path): Path? {
-        cp.javaHome?.let {
-            val javaHomePath = File(it).toPath()
-            if (path == javaHomePath) {
-                return Paths.get(path.toString(), "lib", "src.zip")
-            }
-        }
-        return null
-    }
+        cp.classPath.firstOrNull { it.compiledJar == compiledArchive }?.sourceJar
 }

server/src/main/kotlin/org/javacs/kt/externalsources/JdkSourceArchiveProvider.kt

@@ -0,0 +1,27 @@
+package org.javacs.kt.externalsources
+
+import org.javacs.kt.CompilerClassPath
+import java.io.File
+import java.nio.file.Path
+import java.nio.file.Paths
+
+class JdkSourceArchiveProvider(
+    private val cp: CompilerClassPath
+) : SourceArchiveProvider {
+
+    /**
+     * Checks if the given path is inside the JDK. If it is, we return the corresponding source zip.
+     * Note that this method currently doesn't take into the account the JDK version, which means JDK source code
+     * is only available for JDK 9+ builds.
+     * TODO: improve this resolution logic to work for older JDK versions as well.
+     */
+    override fun fetchSourceArchive(compiledArchive: Path): Path? {
+        cp.javaHome?.let {
+            val javaHomePath = File(it).toPath()
+            if (compiledArchive == javaHomePath) {
+                return Paths.get(compiledArchive.toString(), "lib", "src.zip")
+            }
+        }
+        return null
+    }
+}

server/src/main/kotlin/org/javacs/kt/externalsources/SourceArchiveProvider.kt

@@ -5,3 +5,8 @@ import java.nio.file.Path
 interface SourceArchiveProvider {
     fun fetchSourceArchive(compiledArchive: Path): Path?
 }
+
+class CompositeSourceArchiveProvider(val lhs: SourceArchiveProvider, val rhs: SourceArchiveProvider) : SourceArchiveProvider {
+    override fun fetchSourceArchive(compiledArchive: Path): Path? =
+        lhs.fetchSourceArchive(compiledArchive) ?: rhs.fetchSourceArchive(compiledArchive)
+}