Clean up debouncer

Remove old submit methods and rename 'submit' to 'schedule'.

Additionally, perform some stylistic changes (e.g. using trailing lambda
and operator invocation syntax where possible).

Author: fwcd

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

@@ -253,15 +253,15 @@ class KotlinTextDocumentService(
 
     private fun lintLater(uri: URI) {
         lintTodo.add(uri)
-        debounceLint.submit(::doLint)
+        debounceLint.schedule(::doLint)
     }
 
     private fun lintNow(file: URI) {
         lintTodo.add(file)
         debounceLint.submitImmediately(::doLint)
     }
 
-    private fun doLint(cancelCallback : () -> Boolean) {
+    private fun doLint(cancelCallback: () -> Boolean) {
         LOG.info("Linting {}", describeURIs(lintTodo))
         val files = clearLint()
         val context = sp.compileFiles(files)

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

@@ -156,9 +156,9 @@ class SourcePath(
         fun compileAndUpdate(changed: List<SourceFile>, kind: CompilationKind): BindingContext? {
             if (changed.isEmpty()) return null
             val parse = changed.associateWith { it.parseIfChanged().parsed!! }
-            val all = all()
+            val allFiles = all()
             beforeCompileCallback.invoke()
-            val (context, container) = cp.compiler.compileFiles(parse.values, all, kind)
+            val (context, container) = cp.compiler.compileFiles(parse.values, allFiles, kind)
 
             // Update cache
             for ((f, parsed) in parse) {

server/src/test/kotlin/org/javacs/kt/DebouncerTest.kt

@@ -12,7 +12,7 @@ class DebouncerTest {
 
     @Test fun callQuickly() {
         for (i in 1..10) {
-            debounce.submit { ->
+            debounce.schedule {
                 counter++
             }
         }
@@ -21,4 +21,4 @@ class DebouncerTest {
 
         assertThat(counter, equalTo(1))
     }
-}
+}

shared/src/main/kotlin/org/javacs/kt/util/Debouncer.kt

@@ -21,36 +21,26 @@ class Debouncer(
     private val delayMs = delay.toMillis()
     private var pendingTask: Future<*>? = null
 
-    fun submitImmediately(task: () -> Unit) {
-        pendingTask?.cancel(false)
-        pendingTask = executor.submit(task)
-    }
-
-    fun submitImmediately(task: (cancelCallback : () -> Boolean) -> Unit) {
+    fun submitImmediately(task: (cancelCallback: () -> Boolean) -> Unit) {
         pendingTask?.cancel(false)
         val currentTaskRef = AtomicReference<Future<*>>()
-        val currentTask = executor.submit({ -> task.invoke({ -> val f = currentTaskRef.get(); f?.isCancelled()?:false})})
+        val currentTask = executor.submit { task { currentTaskRef.get()?.isCancelled() ?: false } }
         currentTaskRef.set(currentTask);
         pendingTask = currentTask
     }
 
-    fun submit(task: () -> Unit) {
-        pendingTask?.cancel(false)
-        pendingTask = executor.schedule(task, delayMs, TimeUnit.MILLISECONDS)
-    }
-
-    fun submit(task: (cancelCallback : () -> Boolean) -> Unit) {
+    fun schedule(task: (cancelCallback: () -> Boolean) -> Unit) {
         pendingTask?.cancel(false)
         val currentTaskRef = AtomicReference<Future<*>>()
-        val currentTask = executor.schedule({ -> task.invoke({ -> val f = currentTaskRef.get(); f?.isCancelled()?:false})}, delayMs, TimeUnit.MILLISECONDS)
+        val currentTask = executor.schedule({ task { currentTaskRef.get()?.isCancelled() ?: false } }, delayMs, TimeUnit.MILLISECONDS)
         currentTaskRef.set(currentTask);
         pendingTask = currentTask
     }
 
     fun waitForPendingTask() {
         pendingTask?.get()
     }
-    
+
     fun shutdown(awaitTermination: Boolean) {
         executor.shutdown()
         if (awaitTermination) {