ADFA-3740: comment/uncomment line code actions for Kotlin

app/src/main/java/com/itsaky/androidide/handlers/SnippetHandler.kt

@@ -15,7 +15,7 @@ object SnippetHandler {
 	private val log = LoggerFactory.getLogger(SnippetHandler::class.java)
 
 	fun loadUserSnippets() {
-		loadUserSnippetsForLanguage("java", JavaSnippetScope.entries.toTypedArray())
+		loadUserSnippetsForLanguage("java", JavaSnippetScope.entries)
 		loadUserSnippetsForLanguage("xml", XML_SNIPPET_SCOPES)
 	}
 
@@ -50,7 +50,7 @@ object SnippetHandler {
 
 	private fun <S : ISnippetScope> loadUserSnippetsForLanguage(
 		language: String,
-		scopes: Array<S>,
+		scopes: Iterable<S>,
 	) {
 		SnippetRegistry.clearUserSnippets(language)
 		val userSnippets = UserSnippetLoader.loadUserSnippets(language, scopes)

app/src/main/java/com/itsaky/androidide/ui/CodeEditorView.kt

@@ -46,6 +46,7 @@ import com.itsaky.androidide.lsp.IDELanguageClientImpl
 import com.itsaky.androidide.lsp.api.ILanguageServer
 import com.itsaky.androidide.lsp.api.ILanguageServerRegistry
 import com.itsaky.androidide.lsp.java.JavaLanguageServer
+import com.itsaky.androidide.lsp.kotlin.KotlinLanguageServer
 import com.itsaky.androidide.lsp.xml.XMLLanguageServer
 import com.itsaky.androidide.models.Range
 import com.itsaky.androidide.preferences.internal.EditorPreferences
@@ -545,6 +546,7 @@ class CodeEditorView(
 		val serverID: String =
 			when (file.extension) {
 				"java" -> JavaLanguageServer.SERVER_ID
+				"kt", "kts" -> KotlinLanguageServer.SERVER_ID
 				"xml" -> XMLLanguageServer.SERVER_ID
 				else -> return null
 			}

lsp/api/build.gradle.kts

@@ -54,6 +54,7 @@ dependencies {
 	api(projects.lookup)
 	api(projects.lsp.models)
 	api(projects.preferences)
+	api(projects.idetooltips)
 
 	compileOnly(projects.actions)
 	compileOnly(projects.common)

lsp/api/src/main/java/com/itsaky/androidide/lsp/actions/CommentLineAction.kt

@@ -0,0 +1,86 @@
+/*
+ *  This file is part of AndroidIDE.
+ *
+ *  AndroidIDE is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  AndroidIDE is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.itsaky.androidide.lsp.actions
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import com.itsaky.androidide.actions.ActionData
+import com.itsaky.androidide.actions.ActionItem
+import com.itsaky.androidide.actions.EditorActionItem
+import com.itsaky.androidide.actions.hasRequiredData
+import com.itsaky.androidide.actions.markInvisible
+import com.itsaky.androidide.actions.requireContext
+import com.itsaky.androidide.actions.requireEditor
+import com.itsaky.androidide.actions.requireFile
+import com.itsaky.androidide.idetooltips.TooltipTag
+import com.itsaky.androidide.resources.R
+import io.github.rosemoe.sora.text.batchEdit
+import java.io.File
+
+/** @author Akash Yadav */
+class CommentLineAction(
+	lang: String,
+	private val targetFileExtensions: List<String>,
+	private val lineCommentToken: String,
+) : EditorActionItem {
+
+	constructor(lang: String, extension: String, lineCommentToken: String) :
+			this(lang, listOf(extension), lineCommentToken)
+	override val id: String = "ide.editor.lsp.$lang.commentLine"
+	override var label: String = ""
+
+	override var visible = true
+	override var enabled = true
+	override var icon: Drawable? = null
+	override var location: ActionItem.Location = ActionItem.Location.EDITOR_CODE_ACTIONS
+	override var requiresUIThread: Boolean = true
+	override var tooltipTag: String = TooltipTag.EDITOR_CODE_ACTIONS_COMMENT
+
+	override fun prepare(data: ActionData) {
+		super.prepare(data)
+
+		if (!data.hasRequiredData(Context::class.java, File::class.java)) {
+			markInvisible()
+			return
+		}
+
+		val context = data.requireContext()
+		label = context.getString(R.string.action_comment_line)
+
+		val file = data.requireFile()
+		if (file.extension !in targetFileExtensions) {
+			markInvisible()
+			return
+		}
+	}
+
+	override suspend fun execAction(data: ActionData): Boolean {
+		val editor = data.requireEditor()
+		val text = editor.text
+		val cursor = editor.cursor
+
+		text.batchEdit {
+			for (line in cursor.leftLine..cursor.rightLine) {
+				text.insert(line, 0, lineCommentToken)
+			}
+		}
+
+		return true
+	}
+
+	override fun dismissOnAction() = true
+}

lsp/api/src/main/java/com/itsaky/androidide/lsp/actions/UncommentLineAction.kt

@@ -0,0 +1,92 @@
+/*
+ *  This file is part of AndroidIDE.
+ *
+ *  AndroidIDE is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  AndroidIDE is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.itsaky.androidide.lsp.actions
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import com.itsaky.androidide.actions.ActionData
+import com.itsaky.androidide.actions.ActionItem
+import com.itsaky.androidide.actions.EditorActionItem
+import com.itsaky.androidide.actions.hasRequiredData
+import com.itsaky.androidide.actions.markInvisible
+import com.itsaky.androidide.actions.requireContext
+import com.itsaky.androidide.actions.requireEditor
+import com.itsaky.androidide.actions.requireFile
+import com.itsaky.androidide.idetooltips.TooltipTag
+import com.itsaky.androidide.resources.R
+import io.github.rosemoe.sora.text.batchEdit
+import java.io.File
+
+/** @author Akash Yadav */
+class UncommentLineAction(
+	lang: String,
+	private val targetFileExtensions: List<String>,
+	private val lineCommentToken: String,
+) : EditorActionItem {
+
+	constructor(lang: String, extension: String, lineCommentToken: String) :
+			this(lang, listOf(extension), lineCommentToken)
+
+	override val id: String = "ide.editor.lsp.$lang.uncommentLine"
+	override var label: String = ""
+
+	override var visible = true
+	override var enabled = true
+	override var icon: Drawable? = null
+	override var location: ActionItem.Location = ActionItem.Location.EDITOR_CODE_ACTIONS
+	override var requiresUIThread: Boolean = true
+	override var tooltipTag: String = TooltipTag.EDITOR_CODE_ACTIONS_UNCOMMENT
+
+
+	override fun prepare(data: ActionData) {
+		super.prepare(data)
+
+		if (!data.hasRequiredData(Context::class.java, File::class.java)) {
+			markInvisible()
+			return
+		}
+
+		val context = data.requireContext()
+		label = context.getString(R.string.action_uncomment_line)
+
+		val file = data.requireFile()
+		if (file.extension !in targetFileExtensions) {
+			markInvisible()
+			return
+		}
+	}
+
+	override suspend fun execAction(data: ActionData): Boolean {
+		val editor = data.requireEditor()
+		val text = editor.text
+		val cursor = editor.cursor
+
+		text.batchEdit {
+			for (line in cursor.leftLine..cursor.rightLine) {
+				val l = text.getLineString(line)
+				if (l.trim().startsWith(lineCommentToken)) {
+					val i = l.indexOf(lineCommentToken)
+					text.delete(line, i, line, i + 2)
+				}
+			}
+		}
+
+		return true
+	}
+
+	override fun dismissOnAction() = true
+}

lsp/api/src/main/java/com/itsaky/androidide/lsp/snippets/SnippetParser.kt

@@ -37,7 +37,7 @@ object SnippetParser {
 
 	fun <S : ISnippetScope> parse(
 		lang: String,
-		scopes: Array<S>,
+		scopes: Iterable<S>,
 		snippetFactory: (String, String, List<String>) -> ISnippet = { prefix, desc, body ->
 			DefaultSnippet(prefix, desc, body.toTypedArray())
 		},

lsp/api/src/main/java/com/itsaky/androidide/lsp/snippets/SnippetRegistry.kt

@@ -67,7 +67,7 @@ object SnippetRegistry {
 		return scopes.flatMap { getSnippets(language, it) }
 	}
 
-	fun <S : ISnippetScope> initBuiltIn(language: String, scopes: Array<S>) {
+	fun <S : ISnippetScope> initBuiltIn(language: String, scopes: Iterable<S>) {
 		val parsed = SnippetParser.parse(language, scopes)
 		lock.write {
 			parsed.forEach { (scope, snippets) ->

lsp/api/src/main/java/com/itsaky/androidide/lsp/snippets/UserSnippetLoader.kt

@@ -12,7 +12,7 @@ object UserSnippetLoader {
 
 	fun <S : ISnippetScope> loadUserSnippets(
 		language: String,
-		scopes: Array<S>,
+		scopes: Iterable<S>,
 	): Map<String, List<ISnippet>> {
 		val langDir = getUserSnippetsDir(language)
 		if (!langDir.isDirectory) return emptyMap()

lsp/indexing/build.gradle.kts

@@ -16,4 +16,7 @@ dependencies {
 	api(libs.kotlinx.coroutines.core)
 
 	api(projects.logger)
+
+	testImplementation(projects.testing.unit)
+	testImplementation(libs.tests.kotlinx.coroutines)
 }