Merge upstream

.github/workflows/gradle.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.12.1
+        uses: styfle/cancel-workflow-action@0.13.0
         with:
           access_token: ${{ github.token }}
 

app/src/main/java/io/github/rosemoe/sora/app/MainActivity.kt

@@ -52,6 +52,7 @@ import io.github.rosemoe.sora.app.lsp.LspTestJavaActivity
 import io.github.rosemoe.sora.app.tests.TestActivity
 import io.github.rosemoe.sora.event.ContentChangeEvent
 import io.github.rosemoe.sora.event.EditorKeyEvent
+import io.github.rosemoe.sora.event.InlayHintClickEvent
 import io.github.rosemoe.sora.event.KeyBindingEvent
 import io.github.rosemoe.sora.event.PublishSearchResultEvent
 import io.github.rosemoe.sora.event.SelectionChangeEvent
@@ -91,6 +92,7 @@ import io.github.rosemoe.sora.utils.codePointStringAt
 import io.github.rosemoe.sora.utils.escapeCodePointIfNecessary
 import io.github.rosemoe.sora.utils.toast
 import io.github.rosemoe.sora.widget.CodeEditor
+import io.github.rosemoe.sora.widget.EditorSearcher
 import io.github.rosemoe.sora.widget.EditorSearcher.SearchOptions
 import io.github.rosemoe.sora.widget.SelectionMovement
 import io.github.rosemoe.sora.widget.component.EditorAutoCompletion
@@ -240,6 +242,9 @@ class MainActivity : AppCompatActivity() {
             subscribeAlways<SideIconClickEvent> {
                 toast(R.string.tip_side_icon)
             }
+            subscribeAlways<InlayHintClickEvent> {
+                toast(R.string.tip_inlay_hint)
+            }
             subscribeAlways<TextSizeChangeEvent> { event ->
                 Log.d(
                     TAG,
@@ -256,6 +261,7 @@ class MainActivity : AppCompatActivity() {
                 }
             }
 
+            searcher.replaceOptions = EditorSearcher.ReplaceOptions(true)
             // Handle span interactions
             EditorSpanInteractionHandler(this)
             getComponent<EditorAutoCompletion>()
@@ -285,6 +291,7 @@ class MainActivity : AppCompatActivity() {
         updateBtnState()
 
         switchThemeIfRequired(this, binding.editor)
+        computeSearchOptions()
     }
 
     /**

app/src/main/res/values-zh/strings.xml

@@ -89,6 +89,7 @@
     <string name="hide_soft_kbd_if_hard_kbd_available">物理键盘连接时隐藏软键盘</string>
     <string name="deleting_log_success">日志已删除。</string>
     <string name="tip_side_icon">点击了侧边按钮</string>
+    <string name="tip_inlay_hint">点击了嵌入提示</string>
     <string name="dialog_lsp_entry_title">选择LSP活动</string>
     <string name="dialog_lsp_entry_msg">是否要打开以Kotlin编写的LSP界面？</string>
     <string name="choice_yes">是</string>

app/src/main/res/values/strings.xml

@@ -89,6 +89,7 @@
     <string name="hide_soft_kbd_if_hard_kbd_available">Hide soft kbd if hard kbd available</string>
     <string name="deleting_log_success">Log removed.</string>
     <string name="tip_side_icon">Side icon clicked.</string>
+    <string name="tip_inlay_hint">Inlay hint clicked.</string>
     <string name="dialog_lsp_entry_title">Select LSP Activity</string>
     <string name="dialog_lsp_entry_msg">Do you want to open LspActivity written in Kotlin?</string>
     <string name="choice_yes">Yes</string>

build-logic/build.gradle.kts

@@ -0,0 +1,27 @@
+/*******************************************************************************
+ *    sora-editor - the awesome code editor for Android
+ *    https://github.com/Rosemoe/sora-editor
+ *    Copyright (C) 2020-2026  Rosemoe
+ *
+ *     This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU Lesser General Public
+ *     License as published by the Free Software Foundation; either
+ *     version 2.1 of the License, or (at your option) any later version.
+ *
+ *     This library 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
+ *     Lesser General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Lesser General Public
+ *     License along with this library; if not, write to the Free Software
+ *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ *     USA
+ *
+ *     Please contact Rosemoe by email 2073412493@qq.com if you need
+ *     additional information or have any questions
+ ******************************************************************************/
+
+tasks.register<Delete>("clean").configure {
+    delete(rootProject.layout.buildDirectory)
+}

build.gradle.kts

@@ -68,7 +68,7 @@ fun Project.configureAndroidAndKotlin() {
 
     extensions.findByType<KotlinAndroidExtension>()?.apply {
         compilerOptions {
-            languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_3
+            languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_2
             jvmTarget = JvmTarget.JVM_17
         }
     }

editor-lsp/src/main/java/io/github/rosemoe/sora/lsp/editor/LspEditorUIDelegate.kt

@@ -197,7 +197,7 @@ internal class LspEditorUIDelegate(private val editor: LspEditor) {
         val editorInstance = currentEditorRef.get() ?: return
 
         if (highlights.isNullOrEmpty()) {
-            editorInstance.highlightTexts = null
+            editorInstance.post { editorInstance.highlightTexts = null }
             return
         }
 
@@ -228,7 +228,7 @@ internal class LspEditorUIDelegate(private val editor: LspEditor) {
             )
         }
 
-        editorInstance.highlightTexts = container
+        editorInstance.post { editorInstance.highlightTexts = container }
     }
 
     fun showInlayHints(inlayHints: List<InlayHint>?) {
@@ -256,23 +256,23 @@ internal class LspEditorUIDelegate(private val editor: LspEditor) {
         val hasDocumentColors = !cachedDocumentColors.isNullOrEmpty()
 
         if (!hasInlayHints && !hasDocumentColors) {
-            editorInstance.inlayHints = null
+            editorInstance.post { editorInstance.inlayHints = null }
             return
         }
 
         val container = InlayHintsContainer()
         cachedInlayHints?.inlayHintToDisplay()?.forEach(container::add)
         cachedDocumentColors?.colorInfoToDisplay()?.forEach(container::add)
 
-        editorInstance.inlayHints = container
+        editorInstance.post { editorInstance.inlayHints = container }
     }
 
     private fun resetInlinePresentations() {
         cachedInlayHints = null
         cachedDocumentColors = null
         currentEditorRef.get()?.let {
             if (it.inlayHints != null) {
-                it.inlayHints = null
+                it.post { it.inlayHints = null }
             }
         }
     }

editor-lsp/src/main/java/io/github/rosemoe/sora/lsp/editor/completion/LspCompletionItem.kt

@@ -26,10 +26,13 @@ package io.github.rosemoe.sora.lsp.editor.completion
 
 import io.github.rosemoe.sora.lang.completion.CompletionItemKind
 import io.github.rosemoe.sora.lang.completion.SimpleCompletionIconDrawer.draw
+import io.github.rosemoe.sora.lang.completion.SimpleCompletionIconDrawer.drawColorSpan
+import io.github.rosemoe.sora.lang.completion.SimpleCompletionIconDrawer.drawFileFolder
 import io.github.rosemoe.sora.lang.completion.snippet.parser.CodeSnippetParser
 import io.github.rosemoe.sora.lsp.editor.LspEventManager
 import io.github.rosemoe.sora.lsp.events.EventType
 import io.github.rosemoe.sora.lsp.events.document.applyEdits
+import io.github.rosemoe.sora.lsp.utils.ColorUtils
 import io.github.rosemoe.sora.lsp.utils.asLspPosition
 import io.github.rosemoe.sora.lsp.utils.createPosition
 import io.github.rosemoe.sora.lsp.utils.createRange
@@ -38,10 +41,10 @@ import io.github.rosemoe.sora.text.Content
 import io.github.rosemoe.sora.util.Logger
 import io.github.rosemoe.sora.widget.CodeEditor
 import org.eclipse.lsp4j.CompletionItem
+import org.eclipse.lsp4j.CompletionItemTag
 import org.eclipse.lsp4j.InsertTextFormat
 import org.eclipse.lsp4j.TextEdit
 
-
 class LspCompletionItem(
     private val completionItem: CompletionItem,
     private val eventManager: LspEventManager,
@@ -50,7 +53,6 @@ class LspCompletionItem(
     completionItem.label,
     completionItem.detail
 ) {
-
     init {
         this.prefixLength = prefixLength
         kind =
@@ -60,10 +62,48 @@ class LspCompletionItem(
         sortText = completionItem.sortText
         filterText = completionItem.filterText
         val labelDetails = completionItem.labelDetails
-        if (labelDetails != null && labelDetails.description?.isNotEmpty() == true) {
-            desc = labelDetails.description
+        if (labelDetails != null) {
+            if (labelDetails.description?.isNotEmpty() == true) {
+                desc = labelDetails.description
+            }
+            detail = labelDetails.detail
+        }
+        val tags = completionItem.tags
+        if (tags != null) {
+            deprecated = tags.contains(CompletionItemTag.Deprecated)
+        }
+
+        val fileIcon = when {
+            kind == CompletionItemKind.File || kind == CompletionItemKind.Folder -> {
+                label?.let { drawFileFolder(it.toString()) } ?: desc?.let { drawFileFolder(it.toString()) }
+            }
+            else -> null
+        }
+
+        icon = fileIcon ?: run {
+            val colorValue = extractColor()
+            if (kind == CompletionItemKind.Color && colorValue != null) {
+                drawColorSpan(colorValue)
+            } else {
+                draw(kind ?: CompletionItemKind.Text)
+            }
         }
-        icon = draw(kind ?: CompletionItemKind.Text)
+    }
+
+    fun extractColor(): Int? {
+        val labelColor = label?.let { ColorUtils.parseColor(it.toString()) }
+        val detailColor = desc?.let { ColorUtils.parseColor(it.toString()) }
+
+        val documentation = completionItem.documentation?.let {
+            if (it.isLeft) it.left else it.right.value
+        }
+        val documentationColor = documentation?.let { ColorUtils.parseColor(it) }
+
+        if (documentationColor != null && detailColor == null && labelColor == null && desc == null) {
+            desc = documentation
+        }
+
+        return labelColor ?: detailColor ?: documentationColor
     }
 
     override fun performCompletion(editor: CodeEditor, text: Content, position: CharPosition) {
@@ -84,7 +124,10 @@ class LspCompletionItem(
         if (completionItem.textEdit != null && completionItem.textEdit.isLeft) {
             textEdit = completionItem.textEdit.left
         } else if (completionItem.textEdit?.isRight == true) {
-            textEdit = TextEdit(completionItem.textEdit.right.insert, completionItem.textEdit.right.newText)
+            textEdit = TextEdit(
+                completionItem.textEdit.right.insert,
+                completionItem.textEdit.right.newText
+            )
         }
 
         if (textEdit.newText == null && completionItem.label != null) {
@@ -164,5 +207,3 @@ class LspCompletionItem(
         // do nothing
     }
 }
-
-

editor-lsp/src/main/java/io/github/rosemoe/sora/lsp/events/color/DocumentColor.kt

@@ -140,4 +140,4 @@ class DocumentColorEvent : AsyncEventListener() {
 
 @get:Experimental
 val EventType.documentColor: String
-    get() = "textDocument/documentColor"
+    get() = "textDocument/documentColor"

editor-lsp/src/main/java/io/github/rosemoe/sora/lsp/events/inlayhint/InlayHintEvent.kt

@@ -164,4 +164,4 @@ class InlayHintEvent : AsyncEventListener() {
 
 @get:Experimental
 val EventType.inlayHint: String
-    get() = "textDocument/inlayHint"
+    get() = "textDocument/inlayHint"