capacitor-sora-editor 1.2.1 → 1.8.2

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/lang/styling/EmptyReader.java

@@ -1,66 +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.lang.styling;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.github.abc15018045126.sora.widget.schemes.EditorColorScheme;
-
-public class EmptyReader implements Spans.Reader {
-
-    private final static EmptyReader INSTANCE = new EmptyReader();
-
-    private final List<Span> spans;
-
-    public EmptyReader() {
-        spans = new ArrayList<>(1);
-        spans.add(SpanFactory.obtainNoExt(0, EditorColorScheme.TEXT_NORMAL));
-    }
-
-    public static EmptyReader getInstance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public void moveToLine(int line) {
-
-    }
-
-    @Override
-    public Span getSpanAt(int index) {
-        return spans.get(index);
-    }
-
-    @Override
-    public int getSpanCount() {
-        return 1;
-    }
-
-    @Override
-    public List<Span> getSpansOnLine(int line) {
-        return new ArrayList<>(spans);
-    }
-}
-

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/lang/styling/MappedSpanUpdater.java

@@ -1,190 +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.lang.styling;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.github.abc15018045126.sora.lang.styling.span.SpanExtAttrs;
-import io.github.abc15018045126.sora.widget.schemes.EditorColorScheme;
-
-/**
- * Update spans on text change event
- *
- * @author abc15018045126
- */
-public class MappedSpanUpdater {
-
-    public static void shiftSpansOnMultiLineDelete(List<List<Span>> map, int startLine, int startColumn, int endLine, int endColumn) {
-        int lineCount = endLine - startLine - 1;
-        // Remove unrelated lines
-        while (lineCount > 0) {
-            SpanFactory.recycleAll(map.remove(startLine + 1));
-            lineCount--;
-        }
-        // Clean up start line
-        List<Span> startLineSpans = map.get(startLine);
-        int index = startLineSpans.size() - 1;
-        while (index > 0) {
-            if (startLineSpans.get(index).getColumn() >= startColumn) {
-                startLineSpans.remove(index).recycle();
-                index--;
-            } else {
-                break;
-            }
-        }
-        // Shift end line
-        List<Span> endLineSpans = map.remove(startLine + 1);
-        for (int i = 0; i < endLineSpans.size(); i++) {
-            endLineSpans.get(i).shiftColumnBy(startColumn - endColumn);
-        }
-        while (endLineSpans.size() > 1) {
-            if (endLineSpans.get(0).getColumn() <= startColumn && endLineSpans.get(1).getColumn() <= startColumn) {
-                endLineSpans.remove(0).recycle();
-            } else {
-                break;
-            }
-        }
-        if (endLineSpans.get(0).getColumn() <= startColumn) {
-            endLineSpans.get(0).setColumn(startColumn);
-        }
-        startLineSpans.addAll(endLineSpans);
-    }
-
-    public static void shiftSpansOnSingleLineDelete(List<List<Span>> map, int line, int startCol, int endCol) {
-        if (map == null || map.isEmpty()) {
-            return;
-        }
-        List<Span> spanList = map.get(line);
-        int startIndex = findSpanIndexFor(spanList, 0, startCol);
-        if (startIndex == -1) {
-            //No span is to be updated
-            return;
-        }
-        int endIndex = findSpanIndexFor(spanList, startIndex, endCol);
-        if (endIndex == -1) {
-            endIndex = spanList.size();
-        }
-        // Remove spans inside delete text
-        int removeCount = endIndex - startIndex;
-        for (int i = 0; i < removeCount; i++) {
-            spanList.remove(startIndex).recycle();
-        }
-        // Shift spans
-        int delta = endCol - startCol;
-        while (startIndex < spanList.size()) {
-            spanList.get(startIndex).shiftColumnBy(-delta);
-            startIndex++;
-        }
-        // Ensure there is span
-        if (spanList.isEmpty() || spanList.get(0).getColumn() != 0) {
-            spanList.add(0, SpanFactory.obtainNoExt(0, EditorColorScheme.TEXT_NORMAL));
-        }
-        // Remove spans with length 0
-        for (int i = 0; i + 1 < spanList.size(); i++) {
-            if (spanList.get(i).getColumn() >= spanList.get(i + 1).getColumn()) {
-                spanList.remove(i).recycle();
-                i--;
-            }
-        }
-    }
-
-    public static void shiftSpansOnSingleLineInsert(List<List<Span>> map, int line, int startCol, int endCol) {
-        if (map == null || map.isEmpty()) {
-            return;
-        }
-        List<Span> spanList = map.get(line);
-        int index = findSpanIndexFor(spanList, 0, startCol);
-        if (index == -1) {
-            return;
-        }
-        int originIndex = index;
-        // Shift spans after insert position
-        int delta = endCol - startCol;
-        while (index < spanList.size()) {
-            spanList.get(index++).shiftColumnBy(delta);
-        }
-        // Add extra span for line start
-        if (originIndex == 0) {
-            Span first = spanList.get(0);
-            if (first.getColumn() == EditorColorScheme.TEXT_NORMAL && first.hasSpanExt(SpanExtAttrs.EXT_UNDERLINE_COLOR)) {
-                first.setColumn(0);
-            } else {
-                spanList.add(0, SpanFactory.obtainNoExt(0, EditorColorScheme.TEXT_NORMAL));
-            }
-        }
-    }
-
-    public static void shiftSpansOnMultiLineInsert(List<List<Span>> map, int startLine, int startColumn, int endLine, int endColumn) {
-        // Find extended span
-        List<Span> startLineSpans = map.get(startLine);
-        int extendedSpanIndex = findSpanIndexFor(startLineSpans, 0, startColumn);
-        if (extendedSpanIndex == -1) {
-            extendedSpanIndex = startLineSpans.size() - 1;
-        }
-        if (startLineSpans.get(extendedSpanIndex).getColumn() > startColumn) {
-            extendedSpanIndex--;
-        }
-        Span extendedSpan;
-        if (extendedSpanIndex < 0 || extendedSpanIndex >= startLineSpans.size()) {
-            extendedSpan = SpanFactory.obtainNoExt(0, EditorColorScheme.TEXT_NORMAL);
-        } else {
-            extendedSpan = startLineSpans.get(extendedSpanIndex);
-        }
-        // Create map lines for new lines
-        for (int i = 0; i < endLine - startLine; i++) {
-            List<Span> list = new ArrayList<>();
-            var newSpan = extendedSpan.copy();
-            newSpan.setColumn(0);
-            list.add(newSpan);
-            map.add(startLine + 1, list);
-        }
-        // Add original spans to new line
-        List<Span> endLineSpans = map.get(endLine);
-        int idx = extendedSpanIndex;
-        while (idx < startLineSpans.size()) {
-            Span span = startLineSpans.get(idx++);
-            Span newSpan = span.copy();
-            newSpan.setColumn(Math.max(0, span.getColumn() - startColumn + endColumn));
-            endLineSpans.add(newSpan);
-        }
-        while (extendedSpanIndex + 1 < startLineSpans.size()) {
-            startLineSpans.remove(startLineSpans.size() - 1).recycle();
-        }
-        if (endLineSpans.size() > 1 && endLineSpans.get(0).getColumn() == 0 && endLineSpans.get(1).getColumn() == 0) {
-            endLineSpans.remove(0).recycle();
-        }
-    }
-
-    private static int findSpanIndexFor(List<Span> spans, int initialPosition, int targetCol) {
-        for (int i = initialPosition; i < spans.size(); i++) {
-            if (spans.get(i).getColumn() >= targetCol) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-}
-

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/lang/styling/MappedSpans.java

@@ -1,264 +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.lang.styling;
-
-import androidx.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import io.github.abc15018045126.sora.text.CharPosition;
-import io.github.abc15018045126.sora.widget.schemes.EditorColorScheme;
-
-/**
- * Store spans by mapping.
- *
- * @see Builder
- */
-public class MappedSpans implements Spans {
-
-    private final List<List<Span>> spanMap;
-
-    private MappedSpans(@NonNull List<List<Span>> spanMap) {
-        this.spanMap = spanMap;
-    }
-
-    @Override
-    public void adjustOnInsert(CharPosition start, CharPosition end) {
-        var startLine = start.line;
-        var endLine = end.line;
-        var startColumn = start.column;
-        var endColumn = end.column;
-        if (startLine == endLine) {
-            MappedSpanUpdater.shiftSpansOnSingleLineInsert(spanMap, startLine, startColumn, endColumn);
-        } else {
-            MappedSpanUpdater.shiftSpansOnMultiLineInsert(spanMap, startLine, startColumn, endLine, endColumn);
-        }
-    }
-
-    @Override
-    public void adjustOnDelete(CharPosition start, CharPosition end) {
-        var startLine = start.line;
-        var endLine = end.line;
-        var startColumn = start.column;
-        var endColumn = end.column;
-        if (startLine == endLine) {
-            MappedSpanUpdater.shiftSpansOnSingleLineDelete(spanMap, startLine, startColumn, endColumn);
-        } else {
-            MappedSpanUpdater.shiftSpansOnMultiLineDelete(spanMap, startLine, startColumn, endLine, endColumn);
-        }
-    }
-
-    @Override
-    public Reader read() {
-        return new MappedSpansAccessor();
-    }
-
-    @Override
-    public boolean supportsModify() {
-        return true;
-    }
-
-    @Override
-    public Modifier modify() {
-        return new MappedSpansAccessor();
-    }
-
-    @Override
-    public int getLineCount() {
-        return spanMap.size();
-    }
-
-    /**
-     * Allow you to build a span map linearly.
-     */
-    public static class Builder {
-
-        private final List<List<Span>> spans;
-        private Span last;
-
-        public Builder() {
-            this(128);
-        }
-
-        public Builder(int lineCapacity) {
-            spans = new ArrayList<>(lineCapacity);
-        }
-
-        /**
-         * Add a new span if required.
-         * <p>
-         * If no special style is specified, you can use colorId as style long integer
-         *
-         * @param spanLine Line
-         * @param column   Column
-         * @param style    Style of text
-         */
-        public void addIfNeeded(int spanLine, int column, long style) {
-            if (last != null && last.getStyle() == style) {
-                return;
-            }
-            add(spanLine, SpanFactory.obtainNoExt(column, style));
-        }
-
-        /**
-         * Add a span directly
-         * <p>
-         * Note: the line should always >= the line of span last committed
-         * <p>
-         * If two spans are on the same line, you must add them in order by their column
-         *
-         * @param spanLine The line position of span
-         * @param span     The span
-         */
-        public void add(int spanLine, Span span) {
-            int mapLine = spans.size() - 1;
-            if (spanLine == mapLine) {
-                spans.get(spanLine).add(span);
-            } else if (spanLine > mapLine) {
-                Span extendedSpan = last;
-                if (extendedSpan == null) {
-                    extendedSpan = SpanFactory.obtainNoExt(0, EditorColorScheme.TEXT_NORMAL);
-                }
-                while (mapLine < spanLine) {
-                    List<Span> lineSpans = new ArrayList<>();
-                    lineSpans.add(copyAndSetColumn(extendedSpan, 0));
-                    spans.add(lineSpans);
-                    mapLine++;
-                }
-                List<Span> lineSpans = spans.get(spanLine);
-                if (span.getColumn() == 0) {
-                    lineSpans.clear();
-                }
-                lineSpans.add(span);
-            } else {
-                throw new IllegalStateException("Invalid position");
-            }
-            last = span;
-        }
-
-        /**
-         * This method must be called when whole text is analyzed.
-         * <strong>Note that it is not the line count but line index!</strong>
-         *
-         * @param line The line is the line last of text
-         */
-        public void determine(int line) {
-            int mapLine = spans.size() - 1;
-            var extendedSpan = last;
-            if (extendedSpan == null) {
-                extendedSpan = SpanFactory.obtainNoExt(0, EditorColorScheme.TEXT_NORMAL);
-            }
-            while (mapLine < line) {
-                List<Span> lineSpans = new ArrayList<>();
-                lineSpans.add(copyAndSetColumn(extendedSpan, 0));
-                spans.add(lineSpans);
-                mapLine++;
-            }
-        }
-
-        /**
-         * Ensure the list not empty
-         */
-        public void addNormalIfNull() {
-            if (spans.isEmpty()) {
-                List<Span> spanList = new ArrayList<>();
-                spanList.add(SpanFactory.obtainNoExt(0, EditorColorScheme.TEXT_NORMAL));
-                spans.add(spanList);
-            }
-        }
-
-        public MappedSpans build() {
-            return new MappedSpans(spans);
-        }
-    }
-
-    private class MappedSpansAccessor implements Reader, Modifier {
-
-        private List<Span> span;
-
-        private void checkLine() {
-            if (span == null) {
-                throw new IllegalStateException("line must be set first");
-            }
-        }
-
-        @Override
-        public void moveToLine(int line) {
-            if (line == -1) {
-                span = null;
-                return;
-            }
-            span = spanMap.get(line);
-        }
-
-        @Override
-        public int getSpanCount() {
-            checkLine();
-            return span.size();
-        }
-
-        @Override
-        public Span getSpanAt(int index) {
-            checkLine();
-            return span.get(index);
-        }
-
-        @Override
-        public List<Span> getSpansOnLine(int line) {
-            return Collections.unmodifiableList(spanMap.get(line));
-        }
-
-        @Override
-        public void setSpansOnLine(int line, List<Span> spans) {
-            var last = spanMap.get(spanMap.size() - 1);
-            var extend = last.get(last.size() - 1);
-            while (spanMap.size() <= line) {
-                var list = new ArrayList<Span>();
-                list.add(copyAndSetColumn(extend, 0));
-                spanMap.add(list);
-            }
-            spanMap.set(line, spans);
-        }
-
-        @Override
-        public void addLineAt(int line, List<Span> spans) {
-            spanMap.add(line, spans);
-        }
-
-        @Override
-        public void deleteLineAt(int line) {
-            spanMap.remove(line);
-        }
-    }
-
-    private static Span copyAndSetColumn(Span s, int column) {
-        var span = s.copy();
-        span.setColumn(column);
-        return span;
-    }
-
-}
-