Accept better defaults for ShellClassPathResolver

Update the ShellClassPathResolver to accept
~/.config/kotlin-language-server (instead of KotlinLanguageServer) and
kls-classpath.{sh,bat,cmd} instead of kotlinLspClasspath.{sh,bat,cmd},
along with scripts without a file extension to better adhere to Unix
conventions.

Author: fwcd

README.md

@@ -37,15 +37,15 @@ The project uses the internal APIs of the [Kotlin compiler](https://github.com/J
 
 ### Figuring out the dependencies
 
-Dependencies are determined by the [DefaultClassPathResolver.kt](shared/src/main/kotlin/org/javacs/kt/classpath/DefaultClassPathResolver.kt), which invokes Maven or Gradle to get a list of classpath JARs. Alternatively, projects can also 'manually' provide a list of dependencies through a shell script, located either at `[project root]/kotlinLspClasspath.{sh,bat,cmd}` or `[config root]/KotlinLanguageServer/classpath.{sh,bat,cmd}`, which outputs a list of JARs.
+Dependencies are determined by the [DefaultClassPathResolver.kt](shared/src/main/kotlin/org/javacs/kt/classpath/DefaultClassPathResolver.kt), which invokes Maven or Gradle to get a list of classpath JARs. Alternatively, projects can also 'manually' provide a list of dependencies through a shell script, located either at `[project root]/kls-classpath` or `[config root]/kotlin-language-server/classpath`, which outputs a list of JARs. Depending on your platform, the scripts also can be suffixed with `.{sh,bat,cmd}`.
 
-* Example of the `~/.config/KotlinLanguageServer/classpath.sh` on Linux:
+* Example of the `~/.config/kotlin-language-server/classpath` on Linux:
 ```bash
 #!/bin/bash
 echo /my/path/kotlin-compiler-1.4.10/lib/kotlin-stdlib.jar:/my/path/my-lib.jar
 ```
 
-* Example of the `%HOMEPATH%\.config\KotlinLanguageServer\classpath.bat` on Windows:
+* Example of the `%HOMEPATH%\.config\kotlin-language-server\classpath.bat` on Windows:
 ```cmd
 @echo off
 echo C:\my\path\kotlin-compiler-1.4.10\lib\kotlin-stdlib.jar;C:\my\path\my-lib.jar

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

@@ -29,11 +29,13 @@ internal class ShellClassPathResolver(
     }
 
     companion object {
-        private val scriptExtensions = listOf("sh", "bat", "cmd")
+        private val configDirNames = listOf("kotlin-language-server", "KotlinLanguageServer")
+        private val scriptNames = listOf("kls-classpath", "kotlinLspClasspath")
+        private val scriptExtensions = listOf("", ".sh", ".bat", ".cmd")
 
         /** Create a shell resolver if a file is a pom. */
         fun maybeCreate(file: Path): ShellClassPathResolver? =
-            file.takeIf { scriptExtensions.any { file.endsWith("kotlinLspClasspath.$it") } }
+            file.takeIf { scriptNames.any { name -> scriptExtensions.any { file.endsWith("$name$it") } } }
                 ?.let { ShellClassPathResolver(it) }
 
         /** The root directory for config files. */
@@ -42,12 +44,10 @@ internal class ShellClassPathResolver(
 
         /** Returns the ShellClassPathResolver for the global home directory shell script. */
         fun global(workingDir: Path?): ClassPathResolver =
-            globalConfigRoot.resolve("KotlinLanguageServer")
-                ?.let { root ->
-                    scriptExtensions
-                        .map { root.resolve("classpath.$it") }
-                        .firstOrNull { Files.exists(it) }
-                }
+            configDirNames
+                .map(globalConfigRoot::resolve)
+                .flatMap { root -> scriptExtensions.map { root.resolve("classpath$it") } }
+                .firstOrNull(Files::exists)
                 ?.let { ShellClassPathResolver(it, workingDir) }
                 ?: ClassPathResolver.empty
     }