Merge branch 'dependency-caching' of github.com:daplf/kotlin-language-server into dependency-caching

daplf · daplf · commit 8731d73ad426 · 2023-05-03T03:01:44.000+01:00
diff --git a/shared/src/main/kotlin/org/javacs/kt/classpath/DefaultClassPathResolver.kt b/shared/src/main/kotlin/org/javacs/kt/classpath/DefaultClassPathResolver.kt
@@ -12,7 +12,7 @@ fun defaultClassPathResolver(workspaceRoots: Collection<Path>, db: Database? = n
             .or(workspaceRoots.asSequence().flatMap { workspaceResolvers(it) }.joined)
     ).or(BackupClassPathResolver)
 
-    return if (db != null) CachedClassPathResolver(childResolver, db) else childResolver
+    return db?.let { CachedClassPathResolver(childResolver, it) } ?: childResolver
 }
 
 /** Searches the workspace for all files that could provide classpath info. */

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ fun defaultClassPathResolver(workspaceRoots: Collection<Path>, db: Database? = n`
`12`	`12`	`.or(workspaceRoots.asSequence().flatMap { workspaceResolvers(it) }.joined)`
`13`	`13`	`).or(BackupClassPathResolver)`
`14`	`14`
`15`		`- return if (db != null) CachedClassPathResolver(childResolver, db) else childResolver`
	`15`	`+ return db?.let { CachedClassPathResolver(childResolver, it) } ?: childResolver`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/** Searches the workspace for all files that could provide classpath info. */`