Lint

Author: daplf

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

@@ -1,10 +1,15 @@
 package org.javacs.kt
 
-import com.google.gson.*
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
 import org.eclipse.lsp4j.InitializeParams
 import org.jetbrains.exposed.sql.Database
 import java.lang.reflect.Type
 import java.nio.file.Files
+import java.nio.file.InvalidPathException
 import java.nio.file.Path
 import java.nio.file.Paths
 
@@ -69,7 +74,7 @@ class GsonPathConverter : JsonDeserializer<Path?> {
     override fun deserialize(json: JsonElement, type: Type?, context: JsonDeserializationContext?): Path? {
         return try {
             Paths.get(json.asString)
-        } catch (ex: Exception) {
+        } catch (ex: InvalidPathException) {
             LOG.printStackTrace(ex)
             null
         }

server/src/main/kotlin/org/javacs/kt/index/SymbolIndex.kt

@@ -80,7 +80,9 @@ class PositionEntity(id: EntityID<Int>) : IntEntity(id) {
 /**
  * A global view of all available symbols across all packages.
  */
-class SymbolIndex(private val db: Database = Database.connect("jdbc:h2:mem:symbolindex;DB_CLOSE_DELAY=-1", "org.h2.Driver")) {
+class SymbolIndex(
+    private val db: Database = Database.connect("jdbc:h2:mem:symbolindex;DB_CLOSE_DELAY=-1", "org.h2.Driver")
+) {
     var progressFactory: Progress.Factory = Progress.Factory.None
 
     init {

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

@@ -5,7 +5,9 @@ import org.jetbrains.exposed.dao.IntEntity
 import org.jetbrains.exposed.dao.IntEntityClass
 import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.dao.id.IntIdTable
-import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.sql.Database
+import org.jetbrains.exposed.sql.SchemaUtils
+import org.jetbrains.exposed.sql.deleteAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import java.nio.file.Path
 import java.nio.file.Paths
@@ -47,7 +49,10 @@ class BuildScriptClassPathCacheEntryEntity(id: EntityID<Int>) : IntEntity(id) {
 }
 
 /** A classpath resolver that caches another resolver */
-internal class CachedClassPathResolver(private val wrapped: ClassPathResolver, private val db: Database) : ClassPathResolver {
+internal class CachedClassPathResolver(
+    private val wrapped: ClassPathResolver,
+    private val db: Database
+) : ClassPathResolver {
     override val resolverType: String get() = "Cached + ${wrapped.resolverType}"
 
     private var cachedClassPathEntries: Set<ClassPathEntry>
@@ -96,7 +101,9 @@ internal class CachedClassPathResolver(private val wrapped: ClassPathResolver, p
 
     init {
         transaction(db) {
-            SchemaUtils.createMissingTablesAndColumns(ClassPathMetadataCache, ClassPathCacheEntry, BuildScriptClassPathCacheEntry)
+            SchemaUtils.createMissingTablesAndColumns(
+                ClassPathMetadataCache, ClassPathCacheEntry, BuildScriptClassPathCacheEntry
+            )
         }
     }
 
@@ -152,7 +159,9 @@ internal class CachedClassPathResolver(private val wrapped: ClassPathResolver, p
     private fun updateBuildScriptClasspathCache(newClasspath: Set<Path>) {
         transaction(db) {
             cachedBuildScriptClassPathEntries = newClasspath
-            cachedClassPathMetadata = cachedClassPathMetadata?.copy(buildFileVersion = currentBuildFileVersion) ?: ClasspathMetadata()
+            cachedClassPathMetadata = cachedClassPathMetadata?.copy(
+                buildFileVersion = currentBuildFileVersion
+            ) ?: ClasspathMetadata()
         }
     }
 

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

@@ -75,6 +75,8 @@ 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 val classpathWithSources get() = lhs.classpathWithSources.takeIf { it.isNotEmpty() } ?: rhs.classpathWithSources
+    override val classpathWithSources get() = lhs.classpathWithSources.takeIf {
+        it.isNotEmpty()
+    } ?: rhs.classpathWithSources
     override val currentBuildFileVersion: Long get() = max(lhs.currentBuildFileVersion, rhs.currentBuildFileVersion)
 }