capacitor-sora-editor 1.2.1 → 1.8.2

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

@@ -0,0 +1,38 @@
+package io.github.abc15018045126.sora.widget
+
+import io.github.abc15018045126.sora.lang.Language
+import io.github.abc15018045126.sora.lang.QuickQuoteHandler
+import io.github.abc15018045126.sora.text.ContentReference
+
+/**
+ * Helper class for better Android API compatibility
+ *
+ * @author abc15018045126
+ */
+internal object LanguageHelper {
+
+    @JvmStatic
+    fun getQuickQuoteHandler(language: Language): QuickQuoteHandler? {
+        return try {
+            language.quickQuoteHandler
+        } catch (e: AbstractMethodError) {
+            null
+        }
+    }
+
+    @JvmStatic
+    fun getIndentAdvance(
+        language: Language,
+        content: ContentReference,
+        line: Int,
+        column: Int,
+        spaceCountOnLine: Int,
+        tabCountOnLine: Int
+    ): Int {
+        return try {
+            language.getIndentAdvance(content, line, column, spaceCountOnLine, tabCountOnLine)
+        } catch (e: AbstractMethodError) {
+            language.getIndentAdvance(content, line, column)
+        }
+    }
+}

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/widget/RegionResolver.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
  ******************************************************************************/
 

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

@@ -1,26 +1,4 @@
-/*
- *    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
 
 import io.github.abc15018045126.sora.annotations.UnsupportedUserUsage
@@ -44,25 +22,27 @@ enum class SelectionMovement(
 ) {
     /** Move Up */
     UP({ editor, pos ->
-        val newPos = editor.layout.getUpPosition(pos.line, pos.column)
+        val layout: io.github.abc15018045126.sora.widget.layout.Layout = editor.layout!!
+        val newPos = layout.getUpPosition(pos.line, pos.column)
         editor.text.indexer.getCharPosition(IntPair.getFirst(newPos), IntPair.getSecond(newPos))
     }, MovingBasePosition.LEFT_SELECTION),
 
     /** Move Down */
     DOWN({ editor, pos ->
-        val newPos = editor.layout.getDownPosition(pos.line, pos.column)
+        val layout: io.github.abc15018045126.sora.widget.layout.Layout = editor.layout!!
+        val newPos = layout.getDownPosition(pos.line, pos.column)
         editor.text.indexer.getCharPosition(IntPair.getFirst(newPos), IntPair.getSecond(newPos))
     }, MovingBasePosition.RIGHT_SELECTION),
 
     /** Move Left */
     LEFT({ editor, pos ->
-        val newPos = editor.cursor.getLeftOf(pos.toIntPair())
+        val newPos = editor.cursor!!.getLeftOf(pos.toIntPair())
         editor.text.indexer.getCharPosition(IntPair.getFirst(newPos), IntPair.getSecond(newPos))
     }, MovingBasePosition.LEFT_SELECTION),
 
     /** Move Right */
     RIGHT({ editor, pos ->
-        val newPos = editor.cursor.getRightOf(pos.toIntPair())
+        val newPos = editor.cursor!!.getRightOf(pos.toIntPair())
         editor.text.indexer.getCharPosition(IntPair.getFirst(newPos), IntPair.getSecond(newPos))
     }, MovingBasePosition.RIGHT_SELECTION),
 
@@ -80,12 +60,13 @@ enum class SelectionMovement(
 
     /** Move Page Up */
     PAGE_UP({ editor, pos ->
-        val layout = editor.layout
+        val layout: io.github.abc15018045126.sora.widget.layout.Layout = editor.layout!!
         val rowCount = ceil(editor.height / editor.rowHeight.toFloat()).toInt()
         val currIdx = layout.getRowIndexForPosition(pos.index)
         val afterIdx = Numbers.coerceIn(currIdx - rowCount, 0, layout.rowCount - 1)
         val selOffset = pos.column - layout.getRowAt(currIdx).startColumn
         val row = layout.getRowAt(afterIdx)
+
         val line = row.lineIndex
         val column =
             row.startColumn + Numbers.coerceIn(selOffset, 0, row.endColumn - row.startColumn)
@@ -94,12 +75,13 @@ enum class SelectionMovement(
 
     /** Move Page Down */
     PAGE_DOWN({ editor, pos ->
-        val layout = editor.layout
+        val layout: io.github.abc15018045126.sora.widget.layout.Layout = editor.layout!!
         val rowCount = ceil(editor.height / editor.rowHeight.toFloat()).toInt()
         val currIdx = layout.getRowIndexForPosition(pos.index)
         val afterIdx = Numbers.coerceIn(currIdx + rowCount, 0, layout.rowCount - 1)
         val selOffset = pos.column - layout.getRowAt(currIdx).startColumn
         val row = layout.getRowAt(afterIdx)
+
         val line = row.lineIndex
         val column =
             row.startColumn + Numbers.coerceIn(selOffset, 0, row.endColumn - row.startColumn)
@@ -108,11 +90,12 @@ enum class SelectionMovement(
 
     /** Move To Page Top */
     PAGE_TOP({ editor, pos ->
-        val layout = editor.layout
+        val layout: io.github.abc15018045126.sora.widget.layout.Layout = editor.layout!!
         val currIdx = layout.getRowIndexForPosition(pos.index)
         val selOffset = pos.column - layout.getRowAt(currIdx).startColumn
         val afterIdx = editor.firstVisibleRow
         val row = layout.getRowAt(afterIdx)
+
         val line = row.lineIndex
         val column =
             row.startColumn + Numbers.coerceIn(selOffset, 0, row.endColumn - row.startColumn)
@@ -121,11 +104,12 @@ enum class SelectionMovement(
 
     /** Move To Page Bottom */
     PAGE_BOTTOM({ editor, pos ->
-        val layout = editor.layout
+        val layout: io.github.abc15018045126.sora.widget.layout.Layout = editor.layout!!
         val currIdx = layout.getRowIndexForPosition(pos.index)
         val selOffset = pos.column - layout.getRowAt(currIdx).startColumn
         val afterIdx = editor.lastVisibleRow
         val row = layout.getRowAt(afterIdx)
+
         val line = row.lineIndex
         val column =
             row.startColumn + Numbers.coerceIn(selOffset, 0, row.endColumn - row.startColumn)
@@ -134,7 +118,8 @@ enum class SelectionMovement(
 
     /** Move To Physical Line Start */
     LINE_START({ editor, pos ->
-        if (editor.props.enhancedHomeAndEnd) {
+        if (editor.props!!.enhancedHomeAndEnd) {
+
             val column = IntPair.getFirst(
                 TextUtils.findLeadingAndTrailingWhitespacePos(
                     editor.text.getLine(pos.line)
@@ -154,7 +139,8 @@ enum class SelectionMovement(
     /** Move To Physical Line End */
     LINE_END({ editor, pos ->
         val colNum = editor.text.getColumnCount(pos.line)
-        if (editor.props.enhancedHomeAndEnd) {
+        if (editor.props!!.enhancedHomeAndEnd) {
+
             val column = IntPair.getSecond(
                 TextUtils.findLeadingAndTrailingWhitespacePos(
                     editor.text.getLine(pos.line)
@@ -182,7 +168,8 @@ enum class SelectionMovement(
 
     /** Move To Visual Line Start */
     ROW_START({ editor, pos ->
-        val layout = editor.layout
+        val layout: io.github.abc15018045126.sora.widget.layout.Layout = editor.layout!!
+
         val rowIndex = layout.getRowIndexForPosition(pos.index)
         val row = layout.getRowAt(rowIndex)
         val maxColumn =
@@ -191,7 +178,8 @@ enum class SelectionMovement(
             } else {
                 row.endColumn - 1
             }
-        if (editor.props.enhancedHomeAndEnd) {
+        if (editor.props!!.enhancedHomeAndEnd) {
+
             val column = IntPair.getFirst(
                 TextUtils.findLeadingAndTrailingWhitespacePos(
                     editor.text.getLine(pos.line), row.startColumn, maxColumn
@@ -210,7 +198,8 @@ enum class SelectionMovement(
 
     /** Move To Visual Line End */
     ROW_END({ editor, pos ->
-        val layout = editor.layout
+        val layout: io.github.abc15018045126.sora.widget.layout.Layout = editor.layout!!
+
         val rowIndex = layout.getRowIndexForPosition(pos.index)
         val row = layout.getRowAt(rowIndex)
         val maxColumn =
@@ -219,7 +208,8 @@ enum class SelectionMovement(
             } else {
                 row.endColumn - 1
             }
-        if (editor.props.enhancedHomeAndEnd) {
+        if (editor.props!!.enhancedHomeAndEnd) {
+
             val column = IntPair.getSecond(
                 TextUtils.findLeadingAndTrailingWhitespacePos(
                     editor.text.getLine(pos.line), row.startColumn, maxColumn

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

@@ -0,0 +1,103 @@
+package io.github.abc15018045126.sora.widget
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.util.AttributeSet
+import android.widget.Button
+import android.widget.LinearLayout
+import androidx.annotation.NonNull
+import io.github.abc15018045126.sora.R
+import io.github.abc15018045126.sora.widget.snippet.SnippetController
+
+/**
+ * A simple symbol input view implementation for editor.
+ *
+ *
+ * First, add your symbols by [addSymbols].
+ * Then, bind a certain editor by [bindEditor] so that it works
+ *
+ * @author abc15018045126
+ */
+class SymbolInputView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0,
+    defStyleRes: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr, defStyleRes) {
+
+    var textColor: Int = 0
+        set(value) {
+            field = value
+            for (i in 0 until childCount) {
+                (getChildAt(i) as? Button)?.setTextColor(value)
+            }
+        }
+
+    private var editor: CodeEditor? = null
+
+    init {
+        setBackgroundColor(context.resources.getColor(R.color.defaultSymbolInputBackgroundColor))
+        orientation = HORIZONTAL
+        textColor = context.resources.getColor(R.color.defaultSymbolInputTextColor)
+    }
+
+    /**
+     * Bind editor for the view
+     */
+    fun bindEditor(editor: CodeEditor?) {
+        this.editor = editor
+    }
+
+    /**
+     * Remove all added symbols
+     */
+    fun removeSymbols() {
+        removeAllViews()
+    }
+
+    /**
+     * Add symbols to the view.
+     *
+     * @param display    The texts displayed in button
+     * @param insertText The actual text to be inserted to editor when the button is clicked
+     */
+    fun addSymbols(@NonNull display: Array<String>, @NonNull insertText: Array<String>) {
+        val count = Math.max(display.size, insertText.size)
+        for (i in 0 until count) {
+            val btn = Button(context, null, android.R.attr.buttonStyleSmall)
+            btn.text = display[i]
+            btn.background = ColorDrawable(Color.TRANSPARENT)
+            btn.setTextColor(textColor)
+            addView(btn, LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT))
+            val finalI = i
+            btn.setOnClickListener {
+                val currentEditor = editor
+                if (currentEditor == null || !currentEditor.isEditable) {
+                    return@setOnClickListener
+                }
+
+                if ("\t" == insertText[finalI]) {
+                    val snippetController: io.github.abc15018045126.sora.widget.snippet.SnippetController? = currentEditor.snippetController
+                    if (snippetController != null && snippetController.isInSnippet()) {
+                        snippetController.shiftToNextTabStop()
+                    } else {
+                        currentEditor.indentOrCommitTab()
+                    }
+                } else {
+                    currentEditor.insertText(insertText[finalI], 1)
+                }
+            }
+        }
+    }
+
+    fun forEachButton(@NonNull consumer: ButtonConsumer) {
+        for (i in 0 until childCount) {
+            (getChildAt(i) as? Button)?.let { consumer.accept(it) }
+        }
+    }
+
+    fun interface ButtonConsumer {
+        fun accept(@NonNull btn: Button)
+    }
+}

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

@@ -0,0 +1,261 @@
+package io.github.abc15018045126.sora.widget
+
+import io.github.abc15018045126.sora.text.CharPosition
+import io.github.abc15018045126.sora.text.Content
+import io.github.abc15018045126.sora.text.ContentLine
+
+/**
+ * Define symbol pairs to complete them automatically when the user
+ * enters the first character of pair.
+ *
+ * @author abc15018045126
+ */
+open class SymbolPairMatch(var parent: SymbolPairMatch? = null) {
+
+    private val singleCharPairMaps = mutableMapOf<Char, SymbolPair?>()
+    private val multipleCharByEndPairMaps = mutableMapOf<Char, MutableList<SymbolPair?>>()
+
+    /**
+     * Put a pair of symbol completion
+     * When the user types the [singleCharacter], it will be replaced by [symbolPair]
+     * SymbolPair maybe null to disable completion for this character.
+     *
+     * @see SymbolPair
+     */
+    fun putPair(singleCharacter: Char, symbolPair: SymbolPair?) {
+        singleCharPairMaps[singleCharacter] = symbolPair
+    }
+
+    /**
+     * Put a pair of symbol completion
+     * When the user types the [charArray], it will be replaced by [symbolPair]
+     * SymbolPair maybe null to disable completion for this character.
+     *
+     * @see SymbolPair
+     */
+    fun putPair(charArray: CharArray, symbolPair: SymbolPair?) {
+        val endChar = charArray[charArray.size - 1]
+        multipleCharByEndPairMaps.getOrPut(endChar) { mutableListOf() }.add(symbolPair)
+    }
+
+    /**
+     * Put a pair of symbol completion
+     * When the user types the [openString], it will be replaced by [symbolPair]
+     * SymbolPair maybe null to disable completion for this character.
+     *
+     * @see putPair
+     */
+    fun putPair(openString: String, symbolPair: SymbolPair?) {
+        putPair(openString.toCharArray(), symbolPair)
+    }
+
+    fun matchBestPairBySingleChar(editChar: Char): SymbolPair? {
+        val pair = singleCharPairMaps[editChar]
+        if (pair == null && parent != null) {
+            return parent!!.matchBestPairBySingleChar(editChar)
+        }
+        return pair
+    }
+
+    fun matchBestPairList(editChar: Char): List<SymbolPair?> {
+        var result = multipleCharByEndPairMaps[editChar]
+        if (result == null && parent != null) {
+            val parentResult = parent!!.matchBestPairList(editChar)
+            result = parentResult.toMutableList()
+        }
+        return result ?: emptyList()
+    }
+
+    fun matchBestPair(
+        editor: CodeEditor,
+        cursorPosition: CharPosition,
+        inputCharArray: CharArray?,
+        endChar: Char
+    ): SymbolPair? {
+        val content = editor.text
+        // do not apply single character pairs for text with length > 1
+        val singleCharPair = if (inputCharArray == null) matchBestPairBySingleChar(endChar) else null
+
+        // matches single character symbol pair first
+        if (singleCharPair != null) {
+            singleCharPair.measureCursorPosition(cursorPosition.index)
+            return singleCharPair
+        }
+
+        // find all possible lists, with a single character for fast search
+        val matchList = matchBestPairList(endChar)
+
+        var matchPair: SymbolPair? = null
+        for (pair in matchList) {
+            if (pair == null || !pair.shouldReplace(editor)) {
+                continue
+            }
+            val openCharArray = pair.open.toCharArray()
+
+            // if flag is not 1, no match
+            var matchFlag = 1
+            var insertIndex = cursorPosition.index
+
+            // the size = 1, we need compare characters before cursor, ensure it match the whole open char array
+            if (inputCharArray == null) {
+                var arrayIndex = openCharArray.size - 2
+                while (arrayIndex >= 0) {
+                    if (insertIndex > 0) {
+                        insertIndex--
+                    }
+                    val contentChar = content.get(insertIndex)
+                    matchFlag = if (contentChar == openCharArray[arrayIndex]) matchFlag else 0
+                    arrayIndex--
+                }
+            } else {
+                // Not fully tested.
+
+                // Not all the time the user will enter a string that matches the symbol pair,
+                // such as pasting text,
+                // so if the length of the entered string is greater than the length of the symbol pair,
+                // the two are considered to be mismatched
+                if (inputCharArray.size > openCharArray.size) {
+                    continue
+                }
+
+                var pairIndex = openCharArray.size - 1
+
+                for (charIndex in inputCharArray.size - 1 downTo 1) {
+                    matchFlag = if (inputCharArray[charIndex] == openCharArray[pairIndex]) matchFlag else 0
+                    pairIndex--
+                }
+
+                // input text and symbol pair text not equal fully, continue compare characters before cursor
+                if (matchFlag == 1 && pairIndex > 0) {
+                    // When the loop is stopped the character position
+                    // is still in the first position of the matched characters,
+                    // we need to replace this character,
+                    // so we need to subtract a character position
+                    insertIndex--
+
+                    while (pairIndex >= 0) {
+                        matchFlag = if (content.get(insertIndex) == openCharArray[pairIndex]) matchFlag else 0
+                        insertIndex--
+                        pairIndex--
+                    }
+                }
+            }
+
+            if (matchFlag == 1) {
+                matchPair = pair
+                pair.measureCursorPosition(insertIndex)
+                break
+            }
+        }
+        return matchPair
+    }
+
+    fun removeAllPairs() {
+        singleCharPairMaps.clear()
+        multipleCharByEndPairMaps.clear()
+    }
+
+    /**
+     * Defines a replacement of input
+     */
+    open class SymbolPair {
+        @JvmField
+        val open: String
+        @JvmField
+        val close: String
+        private var symbolPairEx: SymbolPairEx? = null
+        var cursorOffset = 0
+            private set
+        var insertOffset = 0
+            private set
+
+        /**
+         * If your [open] string and [close] string are both ', it makes a pair of single quotes.
+         * This will replace the entered character with a pair of single quotes,
+         * and will move the cursor to the middle of the pair.
+         * This class defines these symbol pairs
+         */
+        constructor(open: String, close: String) {
+            this.open = open
+            this.close = close
+        }
+
+        constructor(open: String, close: String, symbolPairEx: SymbolPairEx?) : this(open, close) {
+            this.symbolPairEx = symbolPairEx
+        }
+
+        open fun shouldReplace(editor: CodeEditor): Boolean {
+            val ex = symbolPairEx ?: return true
+            val content = editor.text
+            val currentLine = content.getLine(editor.cursor?.leftLine ?: 0)
+            return ex.shouldReplace(editor, currentLine, editor.cursor?.leftColumn ?: 0)
+
+        }
+
+        fun shouldDoAutoSurround(content: Content): Boolean {
+            val ex = symbolPairEx ?: return false
+            return ex.shouldDoAutoSurround(content)
+        }
+
+        fun measureCursorPosition(offsetIndex: Int) {
+            cursorOffset = offsetIndex + open.length
+            insertOffset = offsetIndex
+        }
+
+
+        interface SymbolPairEx {
+            /**
+             * The method will be called
+             * to decide whether to perform the replacement or not.
+             * It may be same as vscode language-configuration Auto-closing 'notIn'.
+             * also see [this](https://code.visualstudio.com/api/language-extensions/language-configuration-guide#autoclosing)
+             * If not implemented, always return true
+             *
+             * @param editor      The current edit content,
+             * sometimes you may need to get the analyzed data from [AnalyzeManager]
+             * (e.g. token with tags) and use editor to get more information,
+             * such as the line of the cursor.
+             * @param currentLine The current line edit in the editor,quick analysis it to decide whether to replaced
+             * @param leftColumn  return current cursor column
+             */
+            fun shouldReplace(editor: CodeEditor, currentLine: ContentLine, leftColumn: Int): Boolean {
+                return true
+            }
+
+            /**
+             * when before the replaced and select a range,surrounds the selected content with return ture.
+             * If not implemented, always return false
+             * also see [this](https://code.visualstudio.com/api/language-extensions/language-configuration-guide#autosurrounding)
+             */
+            fun shouldDoAutoSurround(content: Content): Boolean {
+                return false
+            }
+        }
+
+        companion object {
+            /**
+             * Defines that this character does not have to be replaced
+             */
+            @JvmField
+            val EMPTY_SYMBOL_PAIR = SymbolPair("", "")
+        }
+    }
+
+    class DefaultSymbolPairs : SymbolPairMatch() {
+        init {
+            putPair('{', SymbolPair("{", "}"))
+            putPair('(', SymbolPair("(", ")"))
+            putPair('[', SymbolPair("[", "]"))
+            putPair('"', SymbolPair("\"", "\"", object : SymbolPair.SymbolPairEx {
+                override fun shouldDoAutoSurround(content: Content): Boolean {
+                    return content.cursor.isSelected()
+                }
+            }))
+            putPair('\'', SymbolPair("'", "'", object : SymbolPair.SymbolPairEx {
+                override fun shouldDoAutoSurround(content: Content): Boolean {
+                    return content.cursor.isSelected()
+                }
+            }))
+        }
+    }
+}