Merge remote-tracking branch 'upstream/main'

Author: RohitKushvaha01

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

@@ -488,14 +488,21 @@ class LspEditor(
             DocumentHighlightKind.Text to EditorColor(EditorColorScheme.TEXT_HIGHLIGHT_BACKGROUND)
         )
 
+        val borderColors = mapOf(
+            DocumentHighlightKind.Write to EditorColor(EditorColorScheme.TEXT_HIGHLIGHT_STRONG_BORDER),
+            DocumentHighlightKind.Read to EditorColor(EditorColorScheme.TEXT_HIGHLIGHT_BORDER),
+            DocumentHighlightKind.Text to EditorColor(EditorColorScheme.TEXT_HIGHLIGHT_BORDER)
+        )
+
         highlights.forEach {
             container.add(
                 HighlightTextContainer.HighlightText(
                     it.range.start.line,
                     it.range.start.character,
                     it.range.end.line,
                     it.range.end.character,
-                    colors.getValue(it.kind ?: DocumentHighlightKind.Text)
+                    colors.getValue(it.kind ?: DocumentHighlightKind.Text),
+                    borderColors.getValue(it.kind ?: DocumentHighlightKind.Text)
                 )
             )
         }

editor/src/main/java/io/github/rosemoe/sora/graphics/Paint.java

@@ -36,7 +36,6 @@
 public class Paint extends android.graphics.Paint {
 
     private float spaceWidth;
-    private float tabWidth;
     private boolean renderFunctionCharacters;
 
     public Paint() {
@@ -47,7 +46,6 @@ public Paint(boolean renderFunctionCharacters) {
         super();
         this.renderFunctionCharacters = renderFunctionCharacters;
         spaceWidth = measureText(" ");
-        tabWidth = measureText("\t");
     }
 
     public void setRenderFunctionCharacters(boolean renderFunctionCharacters) {
@@ -60,7 +58,6 @@ public boolean isRenderFunctionCharacters() {
 
     public void onAttributeUpdate() {
         spaceWidth = measureText(" ");
-        tabWidth = measureText("\t");
     }
 
     public float getSpaceWidth() {

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

@@ -39,7 +39,8 @@ class HighlightTextContainer {
         var startColumn: Int,
         var endLine: Int,
         var endColumn: Int,
-        val color: ResolvableColor = EditorColor(EditorColorScheme.TEXT_HIGHLIGHT_BACKGROUND)
+        val color: ResolvableColor = EditorColor(EditorColorScheme.TEXT_HIGHLIGHT_BACKGROUND),
+        val borderColor: ResolvableColor = EditorColor(EditorColorScheme.TEXT_HIGHLIGHT_BORDER)
     ) {
         internal fun hasLength(): Boolean {
             return startLine < endLine || (startLine == endLine && startColumn < endColumn)

editor/src/main/java/io/github/rosemoe/sora/text/LineNumberCalculator.java

@@ -343,13 +343,17 @@ public void separate() {
             this.size = divPoint;
             this.next = newNext;
             newNext.next = oldNext;
+
+            compute();
+            newNext.compute();
         }
 
         private void compute() {
-            max = 0;
+            int m = 0;
             for (int i = 0; i < size; i++) {
-                max = Math.max(max, data[i]);
+                m = Math.max(m, data[i]);
             }
+            max = m;
         }
     }
 

editor/src/main/java/io/github/rosemoe/sora/util/BlockIntList.java

@@ -75,7 +75,7 @@
 import androidx.annotation.Px;
 import androidx.annotation.UiThread;
 import androidx.collection.MutableIntSet;
-import androidx.collection.MutableLongObjectMap;
+import androidx.collection.MutableLongLongMap;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -116,7 +116,6 @@
 import io.github.rosemoe.sora.lang.styling.Span;
 import io.github.rosemoe.sora.lang.styling.SpanFactory;
 import io.github.rosemoe.sora.lang.styling.Styles;
-import io.github.rosemoe.sora.lang.styling.color.ResolvableColor;
 import io.github.rosemoe.sora.lang.styling.inlayHint.InlayHintsContainer;
 import io.github.rosemoe.sora.lang.styling.inlayHint.IntSetUpdateRange;
 import io.github.rosemoe.sora.text.CharPosition;
@@ -286,7 +285,7 @@ public class CodeEditor extends View implements ContentListener, Formatter.Forma
     private float dividerMarginRight;
     private float insertSelectionWidth;
     private float blockLineWidth;
-    private float highlightedDelimiterBorderWidth;
+    private float textBorderWidth;
     private float verticalScrollFactor;
     private float lineInfoTextSize;
     private float lineSpacingMultiplier = 1f;
@@ -593,7 +592,7 @@ protected void initialize(AttributeSet attrs, int defStyleAttr, int defStyleRes)
         dpUnit = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, Resources.getSystem().getDisplayMetrics()) / 10f;
         dividerWidth = dpUnit;
         insertSelectionWidth = dpUnit * 1.5f;
-        highlightedDelimiterBorderWidth = dpUnit;
+        textBorderWidth = dpUnit;
         dividerMarginLeft = dividerMarginRight = dpUnit * 2;
 
         matrix = new Matrix();
@@ -1495,7 +1494,7 @@ protected void computeMatchedPositions(int line, LongArrayList positions) {
     }
 
 
-    protected void computeHighlightPositions(int line, MutableLongObjectMap<ResolvableColor> positions) {
+    protected void computeHighlightPositions(int line, MutableLongLongMap positions) {
         positions.clear();
         if (highlightTextContainer == null) {
             return;
@@ -1526,7 +1525,9 @@ protected void computeHighlightPositions(int line, MutableLongObjectMap<Resolvab
                 continue;
             }
             if (startColumn < endColumn) {
-                positions.put(IntPair.pack(startColumn, endColumn), highlight.getColor());
+                int backgroundColor = highlight.getColor().resolve(colorScheme);
+                int borderColor = highlight.getBorderColor().resolve(colorScheme);
+                positions.put(IntPair.pack(startColumn, endColumn), IntPair.pack(backgroundColor, borderColor));
             }
         }
     }
@@ -2983,24 +2984,29 @@ public float getInsertSelectionWidth() {
     }
 
     /**
-     * Border width for highlight delimiter
+     * Border width for text border
      */
-    public void setHighlightedDelimiterBorderWidth(@Px float width) {
+    public void setTextBorderWidth(@Px float width) {
         if (width < 0) {
             throw new IllegalArgumentException("width can not be under zero");
         }
-        this.highlightedDelimiterBorderWidth = width;
+        textBorderWidth = width;
         invalidate();
     }
 
+    /**
+     * @see #setTextBorderWidth(float)
+     */
     @Px
-    public float getHighlightedDelimiterBorderWidth() {
-        return highlightedDelimiterBorderWidth;
+    public float getTextBorderWidth() {
+        return textBorderWidth;
     }
 
     /**
-     * Get Cursor
-     * Internal method!
+     * Get text cursor.
+     * <p>
+     * Always set selection position by {@link #setSelection} or {@link #setSelectionRegion}.
+     * Do not modify the object returned.
      *
      * @return Cursor of text
      */