Convert classpath sources function to property

Author: daplf

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

@@ -45,7 +45,7 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
             }
 
             async.compute {
-                val newClassPathWithSources = resolver.fetchClasspathWithSources()
+                val newClassPathWithSources = resolver.classpathWithSources
                 synchronized(classPath) {
                     syncClassPathEntries(classPath, newClassPathWithSources, "class path")
                 }

shared/src/main/kotlin/org/javacs/kt/classpath/ClassPathResolver.kt

@@ -28,7 +28,7 @@ interface ClassPathResolver {
             emptySet<Path>()
         }
 
-    fun fetchClasspathWithSources(): Set<ClassPathEntry> = classpath
+    val classpathWithSources: Set<ClassPathEntry> get() = classpath
 
     companion object {
         /** A default empty classpath implementation */
@@ -56,7 +56,7 @@ internal class UnionClassPathResolver(val lhs: ClassPathResolver, val rhs: Class
     override val classpathOrEmpty get() = lhs.classpathOrEmpty + rhs.classpathOrEmpty
     override val buildScriptClasspath get() = lhs.buildScriptClasspath + rhs.buildScriptClasspath
     override val buildScriptClasspathOrEmpty get() = lhs.buildScriptClasspathOrEmpty + rhs.buildScriptClasspathOrEmpty
-    override fun fetchClasspathWithSources() = lhs.fetchClasspathWithSources() + rhs.fetchClasspathWithSources()
+    override val classpathWithSources = lhs.classpathWithSources + rhs.classpathWithSources
 }
 
 internal class FirstNonEmptyClassPathResolver(val lhs: ClassPathResolver, val rhs: ClassPathResolver) : ClassPathResolver {
@@ -65,5 +65,5 @@ internal class FirstNonEmptyClassPathResolver(val lhs: ClassPathResolver, val rh
     override val classpathOrEmpty get() = lhs.classpathOrEmpty.takeIf { it.isNotEmpty() } ?: rhs.classpathOrEmpty
     override val buildScriptClasspath get() = lhs.buildScriptClasspath.takeIf { it.isNotEmpty() } ?: rhs.buildScriptClasspath
     override val buildScriptClasspathOrEmpty get() = lhs.buildScriptClasspathOrEmpty.takeIf { it.isNotEmpty() } ?: rhs.buildScriptClasspathOrEmpty
-    override fun fetchClasspathWithSources() = lhs.fetchClasspathWithSources().takeIf { it.isNotEmpty() } ?: rhs.fetchClasspathWithSources()
+    override val classpathWithSources = lhs.classpathWithSources.takeIf { it.isNotEmpty() } ?: rhs.classpathWithSources
 }

shared/src/main/kotlin/org/javacs/kt/classpath/MavenClassPathResolver.kt

@@ -28,7 +28,7 @@ internal class MavenClassPathResolver private constructor(private val pom: Path)
         return artifacts.mapNotNull { findMavenArtifact(it, false)?.let { it1 -> ClassPathEntry(it1, null) } }.toSet()
     }
 
-    override fun fetchClasspathWithSources(): Set<ClassPathEntry> {
+    override val classpathWithSources: Set<ClassPathEntry> get() {
         // Fetch artifacts if not yet present.
         var artifacts: Set<Artifact>
         if (this.artifacts != null) {

shared/src/main/kotlin/org/javacs/kt/classpath/WithStdlibResolver.kt

@@ -9,7 +9,7 @@ internal class WithStdlibResolver(private val wrapped: ClassPathResolver) : Clas
     override val classpathOrEmpty: Set<ClassPathEntry> get() = wrapWithStdlibEntries(wrapped.classpathOrEmpty)
     override val buildScriptClasspath: Set<Path> get() = wrapWithStdlib(wrapped.buildScriptClasspath)
     override val buildScriptClasspathOrEmpty: Set<Path> get() = wrapWithStdlib(wrapped.buildScriptClasspathOrEmpty)
-    override fun fetchClasspathWithSources(): Set<ClassPathEntry> = wrapWithStdlibEntries(wrapped.fetchClasspathWithSources())
+    override val classpathWithSources: Set<ClassPathEntry> = wrapWithStdlibEntries(wrapped.classpathWithSources)
 }
 
 private fun wrapWithStdlibEntries(paths: Set<ClassPathEntry>): Set<ClassPathEntry> {