Fix detekt violations

fwcd · Mar 13, 2024 · 1abe6bf · 1abe6bf
1 parent 2ae1252
commit 1abe6bf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/server/src/main/kotlin/org/javacs/kt/KotlinLanguageServer.kt b/server/src/main/kotlin/org/javacs/kt/KotlinLanguageServer.kt
@@ -108,9 +108,7 @@ class KotlinLanguageServer(
             serverCapabilities.renameProvider = Either.forRight(RenameOptions(false))
         }
 
-        config.workspace.symbolResolveSupport = clientCapabilities?.workspace?.symbol?.resolveSupport?.properties?.let { properties ->
-            if (properties.size > 0) SymbolResolveSupport(true, properties) else null
-        } ?: SymbolResolveSupport(false, emptyList())
+        config.workspace.symbolResolveSupport = clientHasWorkspaceSymbolResolveSupport(clientCapabilities)
 
         @Suppress("DEPRECATION")
         val folders = params.workspaceFolders?.takeIf { it.isNotEmpty() }
@@ -145,6 +143,11 @@ class KotlinLanguageServer(
         InitializeResult(serverCapabilities, serverInfo)
     }
 
+    private fun clientHasWorkspaceSymbolResolveSupport(clientCapabilities: ClientCapabilities) =
+        clientCapabilities?.workspace?.symbol?.resolveSupport?.properties?.let { properties ->
+            if (properties.size > 0) SymbolResolveSupport(true, properties) else null
+        } ?: SymbolResolveSupport(false, emptyList())
+
     private fun connectLoggingBackend() {
         val backend: (LogMessage) -> Unit = {
             client.logMessage(MessageParams().apply {

diff --git a/server/src/main/kotlin/org/javacs/kt/symbols/Symbols.kt b/server/src/main/kotlin/org/javacs/kt/symbols/Symbols.kt
@@ -58,12 +58,22 @@ private fun pickImportantElements(node: PsiElement, includeLocals: Boolean): KtN
         }
 
 private fun workspaceSymbol(locationRequired: Boolean): (KtNamedDeclaration) -> WorkspaceSymbol? {
+    fun location(d: KtNamedDeclaration): Location? {
+        val content = d.containingFile?.text
+        val locationInContent = (d.nameIdentifier?.textRange ?: d.textRange)
+        return if (content != null && locationInContent != null) {
+            Location(d.containingFile.toURIString(), range(content, locationInContent))
+        } else {
+            null
+        }
+    }
+
     return { d ->
         d.name?.let { name ->
             val location: Either<Location, WorkspaceSymbolLocation>? = if (locationRequired) {
                 location(d)?.let { l -> Either.forLeft(l) }
             } else {
-                Either.forRight(workspaceSymbolLocation(d))
+                Either.forRight(WorkspaceSymbolLocation(d.containingFile.toURIString()))
             }
 
             location?.let { WorkspaceSymbol(name, symbolKind(d), it, symbolContainer(d)) }
@@ -82,23 +92,6 @@ private fun symbolKind(d: KtNamedDeclaration): SymbolKind =
             else -> throw IllegalArgumentException("Unexpected symbol $d")
         }
 
-private fun location(d: KtNamedDeclaration): Location? =
-    try {
-        val content = d.containingFile?.text
-        val locationInContent = (d.nameIdentifier?.textRange ?: d.textRange)
-        if (content != null && locationInContent != null) {
-            Location(d.containingFile.toURIString(), range(content, locationInContent))
-        } else {
-            null
-        }
-    } catch (e: Exception) {
-        null
-    }
-
-
-private fun workspaceSymbolLocation(d: KtNamedDeclaration): WorkspaceSymbolLocation =
-    WorkspaceSymbolLocation(d.containingFile.toURIString())
-
 private fun symbolContainer(d: KtNamedDeclaration): String? =
         d.parents
                 .filterIsInstance<KtNamedDeclaration>()