capacitor-sora-editor 1.2.1 → 1.8.2

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

@@ -1,393 +0,0 @@
-/*
- *    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;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import io.github.abc15018045126.sora.graphics.Paint;
-import io.github.abc15018045126.sora.graphics.SingleCharacterWidths;
-import io.github.abc15018045126.sora.lang.analysis.StyleUpdateRange;
-import io.github.abc15018045126.sora.lang.styling.inlayHint.InlayHint;
-import io.github.abc15018045126.sora.text.Content;
-import io.github.abc15018045126.sora.text.ContentLine;
-import io.github.abc15018045126.sora.util.BlockIntList;
-import io.github.abc15018045126.sora.util.IntPair;
-import io.github.abc15018045126.sora.widget.CodeEditor;
-
-/**
- * Layout implementation of editor
- * This layout is never broke unless there is actually a newline character
- *
- * @author Rose
- */
-public class LineBreakLayout extends AbstractLayout {
-
-    private final AtomicInteger reuseCount = new AtomicInteger(0);
-    private BlockIntList widthMaintainer;
-    private BlockIntList inlineElementsWidths;
-    private SingleCharacterWidths measurer;
-
-    public LineBreakLayout(CodeEditor editor, Content text) {
-        super(editor, text);
-        measurer = new SingleCharacterWidths(editor.getTabWidth());
-        measurer.setHandleFunctionCharacters(editor.isRenderFunctionCharacters());
-        widthMaintainer = new BlockIntList();
-        inlineElementsWidths = new BlockIntList();
-        measureAllLines(widthMaintainer, inlineElementsWidths);
-    }
-
-    private void measureAllLines(BlockIntList widthMaintainer, BlockIntList inlineElementsWidths) {
-        if (text == null) {
-            return;
-        }
-        var shadowPaint = new Paint(editor.isRenderFunctionCharacters());
-        shadowPaint.set(editor.getTextPaint());
-        shadowPaint.onAttributeUpdate();
-        var reuseCountLocal = reuseCount.get();
-        var measurerLocal = measurer;
-        final var monitor = new TaskMonitor(1, (results, cancelledCount) -> {
-            final var editor = this.editor;
-            if (editor == null || cancelledCount > 0) {
-                return;
-            }
-            editor.postInLifecycle(() -> {
-                if (LineBreakLayout.this.editor != editor || reuseCountLocal != reuseCount.get()) {
-                    // This layout could have been abandoned when waiting for Runnable execution
-                    // See #307
-                    return;
-                }
-                editor.setLayoutBusy(false);
-                editor.getEventHandler().scrollBy(0, 0);
-            });
-        });
-        var task = new LayoutTask<Void>(monitor) {
-            @Override
-            protected Void compute() {
-                widthMaintainer.lock.lock();
-                try {
-                    text.runReadActionsOnLines(0, text.getLineCount() - 1, (int index, ContentLine line, Content.ContentLineConsumer2.AbortFlag abortFlag) -> {
-                        var width = (int) measurerLocal.measureText(line, 0, line.length(), shadowPaint);
-                        var inlineElementsWidth = measureInlayHints(getInlayHints(index), shadowPaint);
-                        if (shouldRun()) {
-                            widthMaintainer.add(width + inlineElementsWidth);
-                            inlineElementsWidths.add(inlineElementsWidth);
-                        } else {
-                            abortFlag.set = true;
-                        }
-                    });
-                } finally {
-                    widthMaintainer.lock.unlock();
-                }
-                return null;
-            }
-
-            @Override
-            protected boolean shouldRun() {
-                return super.shouldRun() && reuseCount.get() == reuseCountLocal;
-            }
-        };
-        editor.setLayoutBusy(true);
-        submitTask(task);
-    }
-
-    private int measureInlayHints(List<InlayHint> inlayHints, Paint paint) {
-        var width = 0f;
-        for (var inlayHint : inlayHints) {
-            var renderer = editor.getInlayHintRendererForType(inlayHint.getType());
-            if (renderer == null) {
-                continue;
-            }
-            var w = renderer.measure(inlayHint, paint, editor.getRenderer().createTextRowParams().toInlayHintRenderParams());
-            width += w;
-        }
-        return (int) width;
-    }
-
-    private int measureLineAndUpdateInlineWidths(int lineIndex) {
-        return measureLineAndUpdateInlineWidths(lineIndex, false);
-    }
-
-    private int measureLineAndUpdateInlineWidths(int lineIndex, boolean useAdd) {
-        ContentLine line = text.getLine(lineIndex);
-        var inlayHintsWidth = measureInlayHints(getInlayHints(lineIndex), editor.getTextPaint());
-        if (useAdd) {
-            inlineElementsWidths.add(lineIndex, inlayHintsWidth);
-        } else {
-            inlineElementsWidths.set(lineIndex, inlayHintsWidth);
-        }
-        return (int) measurer.measureText(line, 0, line.length(), editor.getTextPaint()) + inlayHintsWidth;
-    }
-
-    private int measureTextRegion(int lineIndex, int start, int end) {
-        ContentLine line = text.getLine(lineIndex);
-        return (int) measurer.measureText(line, start, end, editor.getTextPaint());
-    }
-
-    @NonNull
-    @Override
-    public RowIterator obtainRowIterator(int initialRow, @Nullable SparseArray<ContentLine> preloadedLines) {
-        return new LineBreakLayoutRowItr(this, text, initialRow, preloadedLines);
-    }
-
-    @Override
-    public void invalidateLines(StyleUpdateRange range) {
-        var itr = range.lineIndexIterator(text.getLineCount() - 1);
-        while (itr.hasNext()) {
-            var line = itr.nextInt();
-            widthMaintainer.set(line, measureLineAndUpdateInlineWidths(line));
-        }
-    }
-
-    @Override
-    public int getRowCount() {
-        return text.getLineCount();
-    }
-
-    @Override
-    public void beforeReplace(@NonNull Content content) {
-        // Intentionally empty
-    }
-
-    @Override
-    public void afterInsert(@NonNull Content content, int startLine, int startColumn, int endLine, int endColumn, @NonNull CharSequence insertedContent) {
-        super.afterInsert(content, startLine, startColumn, endLine, endColumn, insertedContent);
-        for (int i = startLine; i <= endLine; i++) {
-            if (i == startLine) {
-                if (endLine == startLine) {
-                    var oldInlayWidths = inlineElementsWidths.get(i);
-                    var newInlayWidths = measureInlayHints(getInlayHints(i), editor.getTextPaint());
-                    inlineElementsWidths.set(i, newInlayWidths);
-                    widthMaintainer.set(i, widthMaintainer.get(i) + measureTextRegion(i, startColumn, endColumn) + (newInlayWidths - oldInlayWidths));
-                } else {
-                    widthMaintainer.set(i, measureLineAndUpdateInlineWidths(i));
-                }
-            } else {
-                widthMaintainer.add(i, measureLineAndUpdateInlineWidths(i, true));
-            }
-        }
-    }
-
-    @Override
-    public void afterDelete(@NonNull Content content, int startLine, int startColumn, int endLine, int endColumn, @NonNull CharSequence deletedContent) {
-        super.afterDelete(content, startLine, startColumn, endLine, endColumn, deletedContent);
-        if (startLine < endLine) {
-            widthMaintainer.removeRange(startLine + 1, endLine + 1);
-            inlineElementsWidths.removeRange(startLine + 1, endLine + 1);
-        }
-        if (startLine == endLine) {
-            var oldInlayWidths = inlineElementsWidths.get(startLine);
-            var newInlayWidths = measureInlayHints(getInlayHints(startLine), editor.getTextPaint());
-            inlineElementsWidths.set(startLine, newInlayWidths);
-            widthMaintainer.set(startLine, widthMaintainer.get(startLine)
-                    - (int) measurer.measureText(deletedContent, 0, endColumn - startColumn, editor.getTextPaint())
-                    + (newInlayWidths - oldInlayWidths));
-        } else {
-            widthMaintainer.set(startLine, measureLineAndUpdateInlineWidths(startLine));
-        }
-    }
-
-    @NonNull
-    @Override
-    public Row getRowAt(int rowIndex) {
-        var row = new Row();
-        row.lineIndex = rowIndex;
-        row.startColumn = 0;
-        row.isLeadingRow = true;
-        row.isTrailingRow = true;
-        row.endColumn = text.getColumnCount(rowIndex);
-        row.inlayHints = getInlayHints(rowIndex);
-        return row;
-    }
-
-    @Override
-    public int getRowIndexForPosition(int index) {
-        return editor.getText().getIndexer().getCharPosition(index).line;
-    }
-
-    @Override
-    public void destroyLayout() {
-        super.destroyLayout();
-        widthMaintainer = null;
-        inlineElementsWidths = null;
-    }
-
-    @Override
-    public int getLineNumberForRow(int row) {
-        return Math.max(0, Math.min(row, text.getLineCount() - 1));
-    }
-
-    @Override
-    public int getLayoutWidth() {
-        return widthMaintainer.size() == 0 ? Integer.MAX_VALUE / 10 : widthMaintainer.getMax();
-    }
-
-    @Override
-    public int getLayoutHeight() {
-        return text.getLineCount() * editor.getLogicalRowHeight();
-    }
-
-    @Override
-    public int getRowTop(int row) {
-        return row * editor.getLogicalRowHeight();
-    }
-
-    @Override
-    public int getRowBottom(int row) {
-        return (row + 1) * editor.getLogicalRowHeight();
-    }
-
-    @Override
-    public int getRowIndexForY(float y) {
-        return (int) (y / editor.getLogicalRowHeight());
-    }
-
-    @Override
-    public long getCharPositionForLayoutOffset(float xOffset, float yOffset) {
-        int lineCount = text.getLineCount();
-        int line = Math.min(lineCount - 1, Math.max((int) (yOffset / editor.getRowHeight()), 0));
-        var tr = editor.getRenderer().createTextRow(line);
-        int res = tr.getIndexForCursorOffset(xOffset);
-        return IntPair.pack(line, res);
-    }
-
-    @NonNull
-    @Override
-    public float[] getCharLayoutOffset(int line, int column, float[] dest) {
-        if (dest == null || dest.length < 2) {
-            dest = new float[2];
-        }
-        dest[0] = editor.getRowBottom(line);
-        var tr = editor.getRenderer().createTextRow(line);
-        dest[1] = tr.getCursorOffsetForIndex(column);
-        return dest;
-    }
-
-    @Override
-    public int getRowCountForLine(int line) {
-        return 1;
-    }
-
-    @Override
-    public long getDownPosition(int line, int column) {
-        int c_line = text.getLineCount();
-        if (line + 1 >= c_line) {
-            return IntPair.pack(line, text.getColumnCount(line));
-        } else {
-            int c_column = text.getColumnCount(line + 1);
-            if (column > c_column) {
-                column = c_column;
-            }
-            return IntPair.pack(line + 1, column);
-        }
-    }
-
-    @Override
-    public long getUpPosition(int line, int column) {
-        if (line - 1 < 0) {
-            return IntPair.pack(0, 0);
-        }
-        int c_column = text.getColumnCount(line - 1);
-        if (column > c_column) {
-            column = c_column;
-        }
-        return IntPair.pack(line - 1, column);
-    }
-
-    public void reuse(Content text) {
-        this.text = text;
-        reuseCount.getAndIncrement();
-        measurer = new SingleCharacterWidths(editor.getTabWidth());
-        measurer.setHandleFunctionCharacters(editor.isRenderFunctionCharacters());
-        try {
-            if (widthMaintainer.lock.tryLock(5, TimeUnit.MILLISECONDS)) {
-                widthMaintainer.lock.unlock();
-                widthMaintainer.clear();
-                inlineElementsWidths.clear();
-                measureAllLines(widthMaintainer, inlineElementsWidths);
-            } else {
-                measureAllLines(widthMaintainer = new BlockIntList(), inlineElementsWidths = new BlockIntList());
-            }
-        } catch (InterruptedException e) {
-            throw new RuntimeException("Unable to wait for lock", e);
-        }
-    }
-
-    static class LineBreakLayoutRowItr implements RowIterator {
-
-        private final Content text;
-        private final Row result;
-        private final int initRow;
-        private final SparseArray<ContentLine> preloadedLines;
-        private int currentRow;
-        private final AbstractLayout layout;
-
-        LineBreakLayoutRowItr(AbstractLayout layout, @NonNull Content text, int initialRow, @Nullable SparseArray<ContentLine> preloadedLines) {
-            initRow = currentRow = initialRow;
-            result = new Row();
-            this.text = text;
-            this.layout = layout;
-            result.isLeadingRow = true;
-            result.isTrailingRow = true;
-            result.startColumn = 0;
-            this.preloadedLines = preloadedLines;
-        }
-
-        @NonNull
-        @Override
-        public Row next() {
-            if (!hasNext()) {
-                throw new NoSuchElementException();
-            }
-            result.lineIndex = currentRow;
-            var line = preloadedLines != null ? preloadedLines.get(currentRow) : null;
-            if (line == null) {
-                line = text.getLine(currentRow);
-            }
-            result.endColumn = line.length();
-            result.inlayHints = layout.getInlayHints(result.lineIndex);
-            currentRow++;
-            return result;
-        }
-
-        @Override
-        public boolean hasNext() {
-            return currentRow >= 0 && currentRow < text.getLineCount();
-        }
-
-        @Override
-        public void reset() {
-            currentRow = initRow;
-        }
-    }
-
-}
-

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

@@ -1,77 +0,0 @@
-/*
- *    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 java.util.List;
-
-import io.github.abc15018045126.sora.lang.styling.inlayHint.InlayHint;
-
-/**
- * This class represents a 'row' in editor.
- * Editor uses this to draw rows
- *
- * @author abc15018045126
- */
-public class Row {
-
-    /**
-     * The index in lines
-     * But not row index
-     */
-    public int lineIndex;
-
-    /**
-     * Whether this row is the first one of a line.
-     * Editor will draw line number to left of this row to indicate this
-     */
-    public boolean isLeadingRow;
-
-    /**
-     * Whether this row is the last one of a line.
-     * Editor will draw soft-wrap or line-break indicator according to this
-     */
-    public boolean isTrailingRow;
-
-    /**
-     * Start index in target line
-     */
-    public int startColumn;
-
-    /**
-     * End index in target line
-     */
-    public int endColumn;
-
-    /**
-     * Inlay hints on the row
-     */
-    public List<InlayHint> inlayHints;
-
-    /**
-     * Extra translation when rendering
-     */
-    public float renderTranslateX;
-
-}
-

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

@@ -1,70 +0,0 @@
-/*
- *    sora-editor - the awesome code editor for Android
- *    https://github.com/abc15018045126/sora-editor
- *    Copyright (C) 2020-2025  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 io.github.abc15018045126.sora.lang.styling.inlayHint.InlayHint;
-
-/**
- * Element on a row
- *
- * @author abc15018045126
- */
-public class RowElement {
-
-    /**
-     * Type of element.
-     *
-     * @see RowElementTypes
-     */
-    public int type;
-
-    /* Fields for type TEXT */
-
-    /**
-     * Start column of text
-     */
-    public int startColumn;
-    /**
-     * End column of text
-     */
-    public int endColumn;
-    /**
-     * Direction of the text run
-     */
-    public boolean isRtlText;
-
-    /* Fields for type INLAY_HINT */
-
-    /**
-     * The inlay hint
-     */
-    public InlayHint inlayHint;
-
-    /**
-     * The expected column position to display after
-     */
-    public int displayColumnPosition;
-
-}
-

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

@@ -1,41 +0,0 @@
-/*
- *    sora-editor - the awesome code editor for Android
- *    https://github.com/abc15018045126/sora-editor
- *    Copyright (C) 2020-2025  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;
-
-/**
- * Type constants for {@link RowElement}
- *
- * @author abc15018045126
- */
-public interface RowElementTypes {
-    /**
-     * Unidirectional text segment
-     */
-    int TEXT = 0;
-    /**
-     * Inlay hint
-     */
-    int INLAY_HINT = 1;
-}
-

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

@@ -1,67 +0,0 @@
-/*
- *    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 androidx.annotation.NonNull;
-
-import java.util.NoSuchElementException;
-
-/**
- * Row iterator.
- * This iterator is able to return a series of Row objects linearly
- * Editor uses this to get information of rows and paint them accordingly
- *
- * @author Rose
- */
-public interface RowIterator {
-
-    /**
-     * Return next Row object
-     * <p>
-     * The result should not be stored, because implementing classes will always return the same
-     * object due to performance
-     *
-     * @return Row object contains the information about a row
-     * @throws NoSuchElementException If no more row available
-     */
-    @NonNull
-    Row next();
-
-    /**
-     * Whether there is more Row object
-     *
-     * @return Whether more row available
-     */
-    boolean hasNext();
-
-    /**
-     * Reset the position to its original position.
-     * <p>
-     * This can be useful when the elements should be iterated for
-     * several times.
-     */
-    void reset();
-
-}
-