capacitor-sora-editor 1.2.1 → 1.8.2

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/widget/ext/EditorSpanInteractionHandler.kt

@@ -18,7 +18,7 @@
  *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
  *     USA
  *
- *     Please contact abc15018045126 by email 2073412493@qq.com if you need
+ *     Please contact abc15018045126 by email abc15018045126@gmail.com if you need
  *     additional information or have any questions
  ******************************************************************************/
 
@@ -59,7 +59,7 @@ open class EditorSpanInteractionHandler(val editor: CodeEditor) {
 
     init {
         eventManager.subscribeAlways<ClickEvent> { event ->
-            if (!event.isFromMouse || (event.isFromMouse && editor.keyMetaStates.isCtrlPressed)) {
+            if (!event.isFromMouse || (event.isFromMouse && editor.getKeyMetaStates().isCtrlPressed)) {
                 handleInteractionEvent(
                     event,
                     SpanInteractionInfo::isClickable,
@@ -99,7 +99,7 @@ open class EditorSpanInteractionHandler(val editor: CodeEditor) {
             IntPair.getSecond(regionInfo) == IN_BOUND &&
             span != null && spanRange != null
         ) {
-            if (!checkCursorRange || spanRange.isPositionInside(editor.cursor.left())) {
+            if (!checkCursorRange || spanRange.isPositionInside(editor.cursor!!.left())) {
                 span.getSpanExt<SpanInteractionInfo>(SpanExtAttrs.EXT_INTERACTION_INFO)?.let {
                     if (predicate(it)) {
                         if (handler(span, it, spanRange)) {

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/widget/layout/AbstractLayout.kt

@@ -0,0 +1,126 @@
+package io.github.abc15018045126.sora.widget.layout
+
+import io.github.abc15018045126.sora.lang.styling.Span
+import io.github.abc15018045126.sora.lang.styling.inlayHint.InlayHint
+import io.github.abc15018045126.sora.text.Content
+import io.github.abc15018045126.sora.widget.CodeEditor
+import java.util.Collections
+import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.ThreadPoolExecutor
+import java.util.concurrent.TimeUnit
+import kotlin.math.max
+
+/**
+ * Base layout implementation of [Layout].
+ * It provides some convenient methods to editor instance and text measuring.
+ *
+ * @author abc15018045126
+ */
+abstract class AbstractLayout(
+    @JvmField protected var editor: CodeEditor?,
+    @JvmField protected var text: Content?
+) : Layout {
+
+    protected open fun getSpans(line: Int): List<Span> {
+        return editor?.getSpansForLine(line)?.filterNotNull() ?: emptyList()
+    }
+
+    internal open fun getInlayHints(line: Int): List<InlayHint> {
+        val inlayHints = editor?.inlayHints
+        return inlayHints?.getForLine(line) ?: Collections.emptyList()
+    }
+
+    override fun afterDelete(
+        content: Content,
+        startLine: Int,
+        startColumn: Int,
+        endLine: Int,
+        endColumn: Int,
+        deletedContent: CharSequence
+    ) {
+    }
+
+    override fun afterInsert(
+        content: Content,
+        startLine: Int,
+        startColumn: Int,
+        endLine: Int,
+        endColumn: Int,
+        insertedContent: CharSequence
+    ) {
+    }
+
+    override fun beforeReplace(content: Content) {
+    }
+    
+    override fun beforeModification(content: Content) {
+    }
+
+    override fun destroyLayout() {
+        editor = null
+        text = null
+    }
+
+    protected fun submitTask(task: LayoutTask<*>) {
+        executor.submit(task)
+    }
+
+    protected open class TaskMonitor(private val taskCount: Int, private val callback: Callback) {
+        private val results: Array<Any?> = arrayOfNulls(taskCount)
+        private var completedCount = 0
+        private var cancelledCount = 0
+
+        @Synchronized
+        fun reportCompleted(result: Any?) {
+            results[completedCount++] = result
+            if (completedCount == taskCount) {
+                callback.onCompleted(results, cancelledCount)
+            }
+        }
+
+        @Synchronized
+        fun reportCancelled() {
+            cancelledCount++
+            reportCompleted(null)
+        }
+
+        interface Callback {
+            fun onCompleted(results: Array<Any?>, cancelledCount: Int)
+        }
+    }
+
+    protected abstract inner class LayoutTask<T>(private val monitor: TaskMonitor) : Runnable {
+        protected open fun shouldRun(): Boolean {
+            return editor != null
+        }
+
+        override fun run() {
+            if (shouldRun()) {
+                val result = compute()
+                monitor.reportCompleted(result)
+            } else {
+                monitor.reportCancelled()
+            }
+        }
+
+        protected abstract fun compute(): T
+    }
+
+    companion object {
+        protected const val SUBTASK_COUNT = 8
+        protected const val MIN_LINE_COUNT_FOR_SUBTASK = 3000
+        private val executor: ThreadPoolExecutor
+
+        init {
+            val maximumPoolSize = max(2, Runtime.getRuntime().availableProcessors())
+            val corePoolSize = 2
+            executor = ThreadPoolExecutor(
+                corePoolSize,
+                maximumPoolSize,
+                1,
+                TimeUnit.MINUTES,
+                LinkedBlockingQueue(128)
+            )
+        }
+    }
+}

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/widget/layout/{Layout.java → Layout.kt}

@@ -1,37 +1,10 @@
-/*
- *    sora-editor - the awesome code editor for Android
- *    https://github.com/abc15018045126/sora-editor
- *    Copyright (C) 2020-2024  abc15018045126
- *
- *     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 abc15018045126 by email 2073412493@qq.com if you need
- *     additional information or have any questions
- */
-package io.github.abc15018045126.sora.widget.layout;
-
-import android.util.SparseArray;
+package io.github.abc15018045126.sora.widget.layout
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.Size;
-
-import io.github.abc15018045126.sora.lang.analysis.StyleUpdateRange;
-import io.github.abc15018045126.sora.text.ContentLine;
-import io.github.abc15018045126.sora.text.ContentListener;
+import android.util.SparseArray
+import androidx.annotation.Size
+import io.github.abc15018045126.sora.lang.analysis.StyleUpdateRange
+import io.github.abc15018045126.sora.text.ContentLine
+import io.github.abc15018045126.sora.text.ContentListener
 
 /**
  * Layout is a manager class for editor to display text
@@ -40,13 +13,13 @@ import io.github.abc15018045126.sora.text.ContentListener;
  *
  * @author Rose
  */
-public interface Layout extends ContentListener {
+interface Layout : ContentListener {
 
     /**
      * Called by editor to destroy this layout
      * This means the layout will never be used again
      */
-    void destroyLayout();
+    fun destroyLayout()
 
     /**
      * Get line index of a row in layout
@@ -54,34 +27,31 @@ public interface Layout extends ContentListener {
      * @param row The row index in layout
      * @return Line index in text
      */
-    int getLineNumberForRow(int row);
+    fun getLineNumberForRow(row: Int): Int
 
     /**
-     * Return a {@link RowIterator} object for editor to draw text rows
+     * Return a [RowIterator] object for editor to draw text rows
      *
      * @param initialRow The first row in result iterator
      * @return Iterator contains rows
      */
-    @NonNull
-    default RowIterator obtainRowIterator(int initialRow) {
-        return obtainRowIterator(initialRow, null);
+    fun obtainRowIterator(initialRow: Int): RowIterator {
+        return obtainRowIterator(initialRow, null)
     }
 
     /**
-     * Return a {@link RowIterator} object for editor to draw text rows
+     * Return a [RowIterator] object for editor to draw text rows
      *
      * @param initialRow The first row in result iterator
      * @param preloadedLines Lines that are already loaded in editor
      * @return Iterator contains rows
      */
-    @NonNull
-    RowIterator obtainRowIterator(int initialRow, @Nullable SparseArray<ContentLine> preloadedLines);
+    fun obtainRowIterator(initialRow: Int, preloadedLines: SparseArray<ContentLine>?): RowIterator
 
     /**
      * Get the specific Row
      */
-    @NonNull
-    Row getRowAt(int rowIndex);
+    fun getRowAt(rowIndex: Int): Row
 
     /**
      * Get the width of this layout
@@ -89,7 +59,7 @@ public interface Layout extends ContentListener {
      *
      * @return Width of layout
      */
-    int getLayoutWidth();
+    val layoutWidth: Int
 
     /**
      * Get the height of this layout
@@ -97,12 +67,12 @@ public interface Layout extends ContentListener {
      *
      * @return Height of layout
      */
-    int getLayoutHeight();
+    val layoutHeight: Int
 
     /**
      * Get the total row count
      */
-    int getRowCount();
+    val rowCount: Int
 
     /**
      * Get character line and column for offsets in layout
@@ -112,7 +82,7 @@ public interface Layout extends ContentListener {
      * @return Packed IntPair, first is line and second is column
      * @see io.github.abc15018045126.sora.util.IntPair
      */
-    long getCharPositionForLayoutOffset(float xOffset, float yOffset);
+    fun getCharPositionForLayoutOffset(xOffset: Float, yOffset: Float): Long
 
     /**
      * Get layout offset of a position in text
@@ -121,10 +91,9 @@ public interface Layout extends ContentListener {
      * @param column Column on line
      * @return An array containing layout offset, first element is the bottom of character and second element is the left of character
      */
-    @NonNull
     @Size(2)
-    default float[] getCharLayoutOffset(int line, int column) {
-        return getCharLayoutOffset(line, column, new float[2]);
+    fun getCharLayoutOffset(line: Int, column: Int): FloatArray {
+        return getCharLayoutOffset(line, column, FloatArray(2))
     }
 
     /**
@@ -135,51 +104,49 @@ public interface Layout extends ContentListener {
      * @param array  If the array is given, it will try to save the two elements in this array. Otherwise, a new array is created
      * @return An array containing layout offset, first element is the bottom of character and second element is the left of character
      */
-    @NonNull
-    float[] getCharLayoutOffset(int line, int column, @Nullable float[] array);
+    fun getCharLayoutOffset(line: Int, column: Int, array: FloatArray?): FloatArray
 
     /**
      * Get how many rows are in the given line
      */
-    int getRowCountForLine(int line);
+    fun getRowCountForLine(line: Int): Int
 
     /**
      * Get position after moving up once
      *
      * @return A packed pair (line, column) describing the result position
      */
-    long getUpPosition(int line, int column);
+    fun getUpPosition(line: Int, column: Int): Long
 
     /**
      * Get position after moving down once
      *
      * @return A packed pair (line, column) describing the result position
      */
-    long getDownPosition(int line, int column);
+    fun getDownPosition(line: Int, column: Int): Long
 
     /**
      * Get row index for text index
      */
-    int getRowIndexForPosition(int index);
+    fun getRowIndexForPosition(index: Int): Int
 
     /**
      * Notify the layout that the given lines have external changes and their layout should be re-calculated.
      */
-    void invalidateLines(StyleUpdateRange range);
+    fun invalidateLines(range: StyleUpdateRange)
 
     /**
      * Get row top y offset
      */
-    int getRowTop(int row);
+    fun getRowTop(row: Int): Int
 
     /**
      * Get row bottom y offset
      */
-    int getRowBottom(int row);
+    fun getRowBottom(row: Int): Int
 
     /**
      * Get row index for y offset
      */
-    int getRowIndexForY(float y);
+    fun getRowIndexForY(y: Float): Int
 }
-