chore: update soraX

.github/workflows/gradle.yml

@@ -24,7 +24,7 @@ jobs:
       SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.13.0
+        uses: styfle/cancel-workflow-action@0.13.1
         with:
           access_token: ${{ github.token }}
 

app/build.gradle.kts

@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
 }
 
 android {

app/src/main/assets/tree-sitter-queries/java/blocks.scm

@@ -1,6 +1,6 @@
 ; Code block patterns for editor
 ; Capture names for scopes does not matter much in sora-editor implementation, you may use 'abc', 'test.xyz', etc.
-; General, editor considers the captured node's region as code block region.
+; Generally, editor considers the captured node's region as code block region.
 ; However, capture name with '.marked' suffix is special. The last terminal node's start position in the capture will be the end position of the block
 ; 'terminal node' refers to a node without children
 

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

@@ -28,7 +28,6 @@ import android.graphics.Typeface
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.os.PersistableBundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
@@ -40,7 +39,6 @@ import android.widget.PopupMenu
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts.GetContent
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.savedstate.write
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -659,7 +657,16 @@ class MainActivity : AppCompatActivity() {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.write {
-            putString("text", binding.editor.text.toString())
+            // For production, you may need to store the text to external storage to avoid data loss
+            val text = binding.editor.text.toString().let {
+                val limit = 128 * 1024
+                if (it.length > limit) {
+                    it.substring(0, limit)
+                } else {
+                    it
+                }
+            }
+            putString("text", text)
             putFloat("font.size", binding.editor.textSizePx)
             putInt("position.left", binding.editor.cursor.left)
             putInt("position.right", binding.editor.cursor.right)

build-logic/gradle/wrapper/gradle-wrapper.properties

@@ -24,6 +24,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

editor-bom/build.gradle.kts

@@ -24,7 +24,7 @@
 
 
 plugins {
-    id("com.vanniktech.maven.publish.base")
+    alias(libs.plugins.publish)
     id("java-platform")
 }
 

editor-lsp/build.gradle.kts

@@ -22,9 +22,9 @@
  *     additional information or have any questions
  ******************************************************************************/
 plugins {
-    id("com.android.library")
+    alias(libs.plugins.android.library)
+    // alias(libs.plugins.publish)
     id("org.jetbrains.kotlin.android")
-    //id("com.vanniktech.maven.publish.base")
 }
 
 android {

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

@@ -226,6 +226,7 @@ class LspEditor(
             if (capabilities.inlayHintProvider?.left != false || capabilities.inlayHintProvider?.right != null) {
                 requestInlayHint(CharPosition(0, 0))
             }
+            requestDocumentColor()
 
             status = LspEditorStatus.CONNECTED
         }.onFailure {
@@ -365,6 +366,9 @@ class LspEditor(
         uiDelegate.showDocumentColors(documentColors)
     }
 
+    fun getAllColorOccurrences(): List<ColorInformation> {
+        return uiDelegate.cachedDocumentColors ?: return emptyList()
+    }
 
     fun hitReTrigger(eventText: CharSequence): Boolean {
         for (trigger in signatureHelpReTriggers) {

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

@@ -49,7 +49,8 @@ internal class LspEditorUIDelegate(private val editor: LspEditor) {
     private var codeActionWindowRef: WeakReference<CodeActionWindow?> = WeakReference(null as CodeActionWindow?)
 
     private var cachedInlayHints: List<InlayHint>? = null
-    private var cachedDocumentColors: List<ColorInformation>? = null
+    internal var cachedDocumentColors: List<ColorInformation>? = null
+        private set
 
     var isEnableHover = true
         set(value) {

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

@@ -36,7 +36,6 @@ import io.github.rosemoe.sora.lsp.events.document.documentChange
 import io.github.rosemoe.sora.lsp.events.highlight.DocumentHighlightEvent
 import io.github.rosemoe.sora.lsp.events.highlight.documentHighlight
 import io.github.rosemoe.sora.lsp.events.hover.hover
-import io.github.rosemoe.sora.lsp.events.inlayhint.inlayHint
 import io.github.rosemoe.sora.lsp.events.signature.signatureHelp
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -52,7 +51,6 @@ class LspEditorContentChangeEvent(private val editor: LspEditor) :
             return
         }
 
-
         editor.coroutineScope.launch(Dispatchers.IO) {
             // send to server
             editor.eventManager.emitAsync(EventType.documentChange, event)

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

@@ -30,6 +30,7 @@ import io.github.rosemoe.sora.lang.styling.inlayHint.ColorInlayHint
 import io.github.rosemoe.sora.lsp.events.EventType
 import io.github.rosemoe.sora.lsp.events.color.documentColor
 import io.github.rosemoe.sora.lsp.events.inlayhint.inlayHint
+import io.github.rosemoe.sora.lsp.utils.asTextRange
 import io.github.rosemoe.sora.text.CharPosition
 import org.eclipse.lsp4j.ColorInformation
 import org.eclipse.lsp4j.InlayHint
@@ -84,15 +85,17 @@ fun List<ColorInformation>.colorInfoToDisplay() = map {
     // Always show on start
     // May we should use style patch to set background?
     ColorInlayHint(
-        it.range.start.line, it.range.start.character,
-        ConstColor(
+        line = it.range.start.line,
+        column = it.range.start.character,
+        color = ConstColor(
             Color.argb(
                 it.color.alpha.toFloat(),
                 it.color.red.toFloat(),
                 it.color.green.toFloat(),
                 it.color.blue.toFloat()
             )
-        )
+        ),
+        colorRange = it.range.asTextRange()
     )
 }
 

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

@@ -231,7 +231,12 @@ class DefaultSignatureHelpLayout : SignatureHelpLayout {
         builder.append("(")
         for (i in parameters.indices) {
             val parameter = parameters[i]
-            val label = parameter.label.left
+            val label = if (parameter.label.isLeft) {
+                parameter.label.left
+            } else {
+                val range = parameter.label.right
+                signature.label.substring(range.first until range.second)
+            }
             val spanStart = builder.length
             builder.append(label)
             val highlight = parameter == activeParameter && activeParameterIndex >= 0

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

@@ -15,6 +15,7 @@ import io.github.rosemoe.sora.lang.diagnostic.DiagnosticsContainer
 import io.github.rosemoe.sora.lang.styling.Span
 import io.github.rosemoe.sora.lang.styling.Styles
 import io.github.rosemoe.sora.lang.styling.TextStyle
+import io.github.rosemoe.sora.lang.styling.inlayHint.InlayHintsContainer
 import io.github.rosemoe.sora.text.Content
 import io.github.rosemoe.sora.text.ContentReference
 import io.github.rosemoe.sora.widget.schemes.EditorColorScheme
@@ -180,6 +181,12 @@ open class EmptyStyleReceiver : StyleReceiver {
     ) {
     }
 
+    override fun setInlayHints(
+        sourceManager: AnalyzeManager,
+        inlayHints: InlayHintsContainer?
+    ) {
+    }
+
     override fun updateBracketProvider(
         sourceManager: AnalyzeManager,
         provider: BracketsProvider?

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

@@ -113,6 +113,10 @@ fun TextRange.asLspRange(): Range {
     return Range(this.start.asLspPosition(), this.end.asLspPosition())
 }
 
+fun Range.asTextRange(): TextRange {
+    return TextRange(this.start.asCharPosition(), this.end.asCharPosition())
+}
+
 fun LspEditor.createDidOpenTextDocumentParams(): DidOpenTextDocumentParams {
     val params = DidOpenTextDocumentParams()
     params.textDocument = TextDocumentItem(

editor/build.gradle.kts

@@ -23,8 +23,8 @@
  ******************************************************************************/
 
 plugins {
-    id("com.android.library")
-    //id("com.vanniktech.maven.publish.base")
+    alias(libs.plugins.android.library)
+    // alias(libs.plugins.publish)
     id("kotlin-android")
 }
 

editor/src/main/java/io/github/rosemoe/sora/lang/analysis/StyleReceiver.java

@@ -29,6 +29,7 @@
 import io.github.rosemoe.sora.lang.brackets.BracketsProvider;
 import io.github.rosemoe.sora.lang.diagnostic.DiagnosticsContainer;
 import io.github.rosemoe.sora.lang.styling.Styles;
+import io.github.rosemoe.sora.lang.styling.inlayHint.InlayHintsContainer;
 
 /**
  * A {@link StyleReceiver} receives spans and other styles from analyzers.
@@ -76,11 +77,17 @@ default void updateStyles(@NonNull AnalyzeManager sourceManager, @NonNull Styles
     }
 
     /**
-     * Specify new diagnostics. You can call it in any thread.
+     * Set new diagnostics. You can call it in any thread.
      * The implementation of this method should make sure that concurrent invocations to it are safe.
      */
     void setDiagnostics(@NonNull AnalyzeManager sourceManager, @Nullable DiagnosticsContainer diagnostics);
 
+    /**
+     * Set new inlay hints. You can call it in any thread.
+     * The implementation of this method should make sure that concurrent invocations to it are safe.
+     */
+    void setInlayHints(@NonNull AnalyzeManager sourceManager, @Nullable InlayHintsContainer inlayHints);
+
     /**
      * Set new provider for brackets highlighting
      */

editor/src/main/java/io/github/rosemoe/sora/lang/styling/Styles.java

@@ -59,10 +59,6 @@ public class Styles {
     public Map<Class<?>, MutableInt> styleTypeCount;
 
     public List<CodeBlock> blocks;
-    /**
-     * Internal, automatically generated
-     */
-    public List<CodeBlock> blocksByStart;
 
     public int suppressSwitch = Integer.MAX_VALUE;
 
@@ -268,10 +264,6 @@ public void finishBuilding() {
             if (sort) {
                 Collections.sort(blocks, CodeBlock.COMPARATOR_END);
             }
-            blocksByStart = new ArrayList<>(blocks);
-            Collections.sort(blocksByStart, CodeBlock.COMPARATOR_START);
-        } else {
-            blocksByStart = null;
         }
         if (lineStyles != null) {
             Collections.sort(lineStyles);

editor/src/main/java/io/github/rosemoe/sora/lang/styling/inlayHint/inlayHints.kt

@@ -25,6 +25,7 @@
 package io.github.rosemoe.sora.lang.styling.inlayHint
 
 import io.github.rosemoe.sora.lang.styling.color.ResolvableColor
+import io.github.rosemoe.sora.text.TextRange
 
 /**
  * A simple text inlay hint
@@ -47,7 +48,8 @@ class TextInlayHint(
 class ColorInlayHint(
     line: Int,
     column: Int,
-    val color: ResolvableColor
+    val color: ResolvableColor,
+    val colorRange: TextRange? = null
 ) : InlayHint(line, column, TYPE_NAME) {
 
     companion object {

editor/src/main/java/io/github/rosemoe/sora/widget/DirectAccessProps.java

@@ -427,11 +427,6 @@ public class DirectAccessProps implements Serializable {
     @InvalidateRequired
     public boolean stickyScrollPreferInnerScope = false;
 
-    /**
-     * Limit for sticky scroll dataset size
-     */
-    public int stickyScrollIterationLimit = 1000;
-
     /**
      * Hide partially or all of the stuck lines when text is selected
      */

editor/src/main/java/io/github/rosemoe/sora/widget/EditorRenderer.java

@@ -1025,51 +1025,66 @@ protected List<CodeBlock> getStuckCodeBlocks() {
         int startLine = editor.getFirstVisibleLine();
         int offsetY = editor.getOffsetY(), rowHeight = editor.getRowHeight();
         List<CodeBlock> codeBlocks;
-        if ((styles = editor.getStyles()) == null || (codeBlocks = styles.blocksByStart) == null) {
+        if ((styles = editor.getStyles()) == null || (codeBlocks = styles.blocks) == null) {
             return null;
         }
-        int size = codeBlocks.size();
-        List<CodeBlock> candidates = new ArrayList<>();
-        var limit = editor.getProps().stickyScrollIterationLimit;
-        var maxLine = content.getLineCount();
-        for (int i = 0; i < size && i < limit; i++) {
-            var block = codeBlocks.get(i);
-            if (block == null || block.startLine > block.endLine ||
-                    block.startLine > maxLine || block.endLine > maxLine ||
-                    block.startLine < 0) {
+
+        List<CodeBlock> visibleBlocks = new ArrayList<>();
+        int first = editor.getFirstVisibleLine();
+        int last = editor.getLastVisibleLine();
+        boolean mark = false;
+        int invalidCount = 0;
+        int maxCount = styles.getSuppressSwitch();
+        int mm = editor.binarySearchEndBlock(first, codeBlocks);
+        if (mm == -1) {
+            mm = 0;
+        }
+        for (int curr = mm; curr < codeBlocks.size(); curr++) {
+            CodeBlock block = codeBlocks.get(curr);
+            if (block == null) {
                 continue;
             }
-            if (block.startLine > startLine) {
-                break;
+            if (CodeEditor.hasVisibleRegion(block.startLine, block.endLine, first, last)) {
+                visibleBlocks.add(block);
+                mark = true;
+            } else if (mark) {
+                if (invalidCount >= maxCount) break;
+                invalidCount++;
             }
+        }
+        // Sort visible blocks by start position and check constraints
+        Collections.sort(visibleBlocks, CodeBlock.COMPARATOR_START);
+        List<CodeBlock> finalCandidates = new ArrayList<>();
+        for (int i = 0; i < visibleBlocks.size(); i++) {
+            var block = visibleBlocks.get(i);
             if (block.endLine > startLine && editor.getRowTop(block.startLine) - offsetY < 0) {
-                candidates.add(block);
+                finalCandidates.add(block);
                 startLine++;
                 offsetY += rowHeight;
             }
         }
         var maxLines = editor.getProps().stickyScrollMaxLines;
-        if (candidates.size() > maxLines) {
+        if (finalCandidates.size() > maxLines) {
             if (maxLines <= 0) {
                 return null;
             }
             if (editor.getProps().stickyScrollPreferInnerScope) {
-                candidates = candidates.subList(candidates.size() - maxLines, candidates.size());
+                finalCandidates = finalCandidates.subList(finalCandidates.size() - maxLines, finalCandidates.size());
             } else {
-                candidates = candidates.subList(0, maxLines);
+                finalCandidates = finalCandidates.subList(0, maxLines);
             }
         }
         if (editor.getCursor().isSelected() && editor.getProps().stickyScrollAutoCollapse) {
             var limitLine = editor.getCursor().getLeftLine();
             var firstVis = editor.getFirstVisibleLine();
             int lastSelectionLine = editor.getCursor().getRightLine();
             if (lastSelectionLine >= firstVis) {
-                while (!candidates.isEmpty() && firstVis + candidates.size() >= limitLine) {
-                    candidates.remove(candidates.size() - 1);
+                while (!finalCandidates.isEmpty() && firstVis + finalCandidates.size() >= limitLine) {
+                    finalCandidates.remove(finalCandidates.size() - 1);
                 }
             }
         }
-        return candidates;
+        return finalCandidates;
     }
 
     private final LineStyles coordinateLine = new LineStyles(0);