Merge remote-tracking branch 'upstream/main'

Author: RohitKushvaha01

.github/workflows/gradle.yml

@@ -53,7 +53,7 @@ jobs:
           ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MVN_SIGNING_KEY_PASSWORD }}
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: ${{ !github.head_ref }}
         with:
           name: apk-debug

build-logic/convention/src/main/kotlin/Versions.kt

@@ -24,8 +24,8 @@
 @SuppressWarnings("unused")
 object Versions {
     // Project versions
-    private const val version = "0.24.1"
-    const val versionCode = 90
+    private const val version = "0.24.2"
+    const val versionCode = 91
 
     val versionName by lazy {
         if (CI.isCiBuild) {

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

@@ -614,6 +614,13 @@ object SimpleMarkdownRenderer {
         val length = text.length
         while (index < length) {
             val current = text[index]
+            if (current == '\\') {
+                if (index + 1 < length && text[index + 1] in escapeCharacters) {
+                    nodes.add(Inline.Text(text[index + 1].toString()))
+                    index += 2
+                    continue
+                }
+            }
             if (current == '`') {
                 val closing = text.indexOf('`', index + 1)
                 if (closing > index) {
@@ -687,7 +694,7 @@ object SimpleMarkdownRenderer {
         var index = start
         while (index < text.length) {
             val c = text[index]
-            if (c == '`' || c == '*' || c == '_' || c == '[') {
+            if (c == '`' || c == '*' || c == '_' || c == '[' || c == '\\') {
                 break
             }
             index++
@@ -967,6 +974,7 @@ object SimpleMarkdownRenderer {
     private const val leadingMargin = 24
     private const val indentMargin = 24
     private const val lineSeparator = "──────────"
+    private val escapeCharacters = "\\`*_{}[]()#+-.!<>|:".toSet()
     private val DEFAULT_HEADING_SCALE = floatArrayOf(1.6f, 1.4f, 1.25f, 1.1f, 1.05f, 1.0f)
 }
 

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

@@ -25,15 +25,13 @@
 package io.github.rosemoe.sora.lsp.utils
 
 import android.graphics.Color
-import android.util.Log
 import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
 import io.github.rosemoe.sora.lang.diagnostic.DiagnosticDetail
 import io.github.rosemoe.sora.lang.diagnostic.DiagnosticRegion
 import io.github.rosemoe.sora.lsp.editor.LspEditor
 import io.github.rosemoe.sora.text.CharPosition
 import io.github.rosemoe.sora.text.TextRange
-import io.github.rosemoe.sora.util.ArrayList
 import io.github.rosemoe.sora.widget.CodeEditor
 import org.eclipse.lsp4j.CompletionContext
 import org.eclipse.lsp4j.CompletionParams

editor/src/main/java/io/github/rosemoe/sora/data/ObjectAllocator.java

@@ -25,12 +25,21 @@
 
 import android.util.SparseArray;
 
+import androidx.annotation.NonNull;
+
 import java.util.Arrays;
 
+import io.github.rosemoe.sora.text.CharArrayWrapper;
 import io.github.rosemoe.sora.text.FunctionCharacters;
 
 public class SingleCharacterWidths {
 
+    /**
+     * Floating-point precision steps.
+     * <p>
+     * Introduced to avoid accumulated floating-point errors.
+     */
+    private final static long PRECISION = 1000L;
     public final float[] widths;
     public final SparseArray<Float> codePointWidths;
     public final char[] buffer;
@@ -69,7 +78,7 @@ public void clearCache() {
     /**
      * Measure a single character
      */
-    public float measureChar(char ch, Paint p) {
+    public float measureChar(char ch, @NonNull Paint p) {
         var rate = 1;
         if (ch == '\t') {
             ch = ' ';
@@ -86,8 +95,9 @@ public float measureChar(char ch, Paint p) {
 
     /**
      * Measure a single character
+     * @param cp Code Point
      */
-    public float measureCodePoint(int cp, Paint p) {
+    public float measureCodePoint(int cp, @NonNull Paint p) {
         if (cp <= 65535) {
             return measureChar((char) cp, p);
         }
@@ -103,55 +113,27 @@ public float measureCodePoint(int cp, Paint p) {
     /*
      * Measure text
      */
-    public float measureText(char[] chars, int start, int end, Paint p) {
-        float width = 0f;
-        for (int i = start; i < end; i++) {
-            char ch = chars[i];
-            if (isEmoji(ch)) {
-                if (i + 4 <= end) {
-                    p.getTextWidths(chars, i, 4, widths);
-                    if (widths[0] > 0 && widths[1] == 0 && widths[2] == 0 && widths[3] == 0) {
-                        i += 3;
-                        width += widths[0];
-                        continue;
-                    }
-                }
-                int commitEnd = Math.min(end, i + 2);
-                int len = commitEnd - i;
-                if (len >= 0) {
-                    System.arraycopy(chars, i, buffer, 0, len);
-                }
-                width += p.measureText(buffer, 0, len);
-                i += len - 1;
-            } else if(isHandleFunctionCharacters() && FunctionCharacters.isEditorFunctionChar(ch)) {
-                var name = FunctionCharacters.getNameForFunctionCharacter(ch);
-                for (int j = 0;j < name.length();j++) {
-                    width += measureChar(name.charAt(j), p);
-                }
-            } else {
-                width += measureChar(ch, p);
-            }
-        }
-        return width;
+    public float measureText(char[] chars, int start, int end, @NonNull Paint p) {
+        return measureText(new CharArrayWrapper(chars, chars.length), start, end, p);
     }
 
-    public float measureText(CharSequence str, Paint p) {
+    public float measureText(@NonNull CharSequence str, @NonNull Paint p) {
         return measureText(str, 0, str.length(), p);
     }
 
     /**
      * Measure text
      */
-    public float measureText(CharSequence str, int start, int end, Paint p) {
-        float width = 0f;
+    public float measureText(@NonNull CharSequence str, int start, int end, @NonNull Paint p) {
+        long width = 0;
         for (int i = start; i < end; i++) {
             char ch = str.charAt(i);
             if (isEmoji(ch)) {
                 if (i + 4 <= end) {
-                    p.getTextWidths(str, i, i + 4, widths);
+                    p.getTextWidths(str, i, 4, widths);
                     if (widths[0] > 0 && widths[1] == 0 && widths[2] == 0 && widths[3] == 0) {
                         i += 3;
-                        width += widths[0];
+                        width += (long) Math.ceil(widths[0] * PRECISION);
                         continue;
                     }
                 }
@@ -160,18 +142,18 @@ public float measureText(CharSequence str, int start, int end, Paint p) {
                 for (int j = 0; j < len; j++) {
                     buffer[j] = str.charAt(i + j);
                 }
-                width += p.measureText(buffer, 0, len);
+                width += (long) Math.ceil(p.measureText(buffer, 0, len) * PRECISION);
                 i += len - 1;
             } else if(isHandleFunctionCharacters() && FunctionCharacters.isEditorFunctionChar(ch)) {
                 var name = FunctionCharacters.getNameForFunctionCharacter(ch);
                 for (int j = 0;j < name.length();j++) {
-                    width += measureChar(name.charAt(j), p);
+                    width += (long) Math.ceil(measureChar(name.charAt(j), p) * PRECISION);
                 }
             } else {
-                width += measureChar(ch, p);
+                width += (long) Math.ceil(measureChar(ch, p) * PRECISION);
             }
         }
-        return width;
+        return (float) width / PRECISION;
     }
 
 }