Pass IndexingConfiguration to SourcePath

Author: fwcd

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

@@ -20,12 +20,12 @@ import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CompletableFuture.completedFuture
 
 class KotlinLanguageServer : LanguageServer, LanguageClientAware, Closeable {
-    private val config = Configuration()
+    val config = Configuration()
     val classPath = CompilerClassPath(config.compiler)
 
     private val tempDirectory = TemporaryDirectory()
     private val uriContentProvider = URIContentProvider(JarClassContentProvider(config.externalSources, classPath, tempDirectory))
-    val sourcePath = SourcePath(classPath, uriContentProvider)
+    val sourcePath = SourcePath(classPath, uriContentProvider, config.indexing)
     val sourceFiles = SourceFiles(sourcePath, uriContentProvider)
 
     private val textDocuments = KotlinTextDocumentService(sourceFiles, sourcePath, config, tempDirectory, uriContentProvider)

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

@@ -128,7 +128,6 @@ class KotlinWorkspaceService(
                 val indexing = config.indexing
                 get("enabled")?.asBoolean?.let {
                     indexing.enabled = it
-                    sp.indexEnabled = it
                 }
             }
 

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

@@ -7,6 +7,7 @@ import org.javacs.kt.util.filePath
 import org.javacs.kt.util.describeURI
 import org.javacs.kt.index.SymbolIndex
 import org.javacs.kt.progress.Progress
+import org.javacs.kt.IndexingConfiguration
 import com.intellij.lang.Language
 import com.intellij.psi.PsiFile
 import com.intellij.openapi.fileTypes.FileType
@@ -25,14 +26,15 @@ import java.util.concurrent.locks.ReentrantLock
 
 class SourcePath(
     private val cp: CompilerClassPath,
-    private val contentProvider: URIContentProvider
+    private val contentProvider: URIContentProvider,
+    private val indexingConfig: IndexingConfiguration
 ) {
     private val files = mutableMapOf<URI, SourceFile>()
     private val parseDataWriteLock = ReentrantLock()
     private val indexAsync = AsyncExecutor()
 
     val index = SymbolIndex()
-    var indexEnabled = true
+    var indexEnabled: Boolean by indexingConfig::enabled
     var beforeCompileCallback: () -> Unit = {}
 
     var progressFactory: Progress.Factory = Progress.Factory.None