capacitor-sora-editor 1.2.1 → 1.8.2

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/lang/format/AsyncFormatter.java

@@ -1,198 +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.format;
-
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
-
-import java.lang.ref.WeakReference;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
-import io.github.abc15018045126.sora.text.Content;
-import io.github.abc15018045126.sora.text.TextRange;
-
-/**
- * Base class for formatting code in another thread.
- */
-public abstract class AsyncFormatter implements Formatter {
-
-    private final static String LOG_TAG = "AsyncFormatter";
-    private static int sThreadId = 0;
-    private final ReentrantLock lock = new ReentrantLock();
-    private final Condition condition = lock.newCondition();
-    private WeakReference<FormatResultReceiver> receiver;
-    private volatile Content text;
-    private volatile TextRange range;
-    private volatile TextRange cursorRange;
-
-    private FormattingThread thread;
-
-    private synchronized static int nextThreadId() {
-        sThreadId++;
-        return sThreadId;
-    }
-
-    @Override
-    public void setReceiver(FormatResultReceiver receiver) {
-        if (receiver == null) {
-            this.receiver = null;
-            return;
-        }
-        this.receiver = new WeakReference<>(receiver);
-    }
-
-    private void run() {
-        if (thread == null || !thread.isAlive()) {
-            // Create new thread
-            Log.v(LOG_TAG, "Starting a new thread for formatting");
-            thread = new FormattingThread();
-            thread.setDaemon(true);
-            thread.setName("AsyncFormatter-" + nextThreadId());
-            thread.start();
-        } else {
-            // Wake up thread
-            Log.v(LOG_TAG, "Waking up thread for formatting");
-            lock.lock();
-            condition.signal();
-            lock.unlock();
-        }
-    }
-
-    @Override
-    public void format(@NonNull Content text, @NonNull TextRange cursorRange) {
-        this.text = text;
-        range = null;
-        this.cursorRange = cursorRange;
-        run();
-    }
-
-    @Override
-    public boolean isRunning() {
-        return thread != null && thread.isAlive() && lock.isLocked();
-    }
-
-    @Override
-    public void formatRegion(@NonNull Content text, @NonNull TextRange rangeToFormat, @NonNull TextRange cursorRange) {
-        this.text = text;
-        range = rangeToFormat;
-        this.cursorRange = cursorRange;
-        run();
-    }
-
-    /**
-     * like {@link Formatter#format(Content, TextRange)}, but run in background thread.
-     * <p>
-     * Implementation of this method can edit text directly to generate formatted code.
-     *
-     * @return the new cursor range to be applied to the text
-     */
-    @WorkerThread
-    @Nullable
-    public abstract TextRange formatAsync(@NonNull Content text, @NonNull TextRange cursorRange);
-
-    /**
-     * like {@link Formatter#formatRegion(Content, TextRange, TextRange)}, but run in background thread
-     * <p>
-     * Implementation of this method can edit text directly to generate formatted code.
-     *
-     * @return the new cursor range to be applied to the text
-     */
-    @WorkerThread
-    @Nullable
-    public abstract TextRange formatRegionAsync(@NonNull Content text, @NonNull TextRange rangeToFormat, @NonNull TextRange cursorRange);
-
-    private void sendUpdate(Content text, TextRange cursorRange) {
-        FormatResultReceiver r;
-        if (!Thread.currentThread().isInterrupted() && receiver != null && (r = receiver.get()) != null) {
-            r.onFormatSucceed(text, cursorRange);
-        }
-    }
-
-    private void sendFailure(Throwable throwable) {
-        FormatResultReceiver r;
-        if (!Thread.currentThread().isInterrupted() && receiver != null && (r = receiver.get()) != null) {
-            r.onFormatFail(throwable);
-        }
-    }
-
-    @Override
-    public void cancel() {
-        if (thread != null) {
-            final var t = thread;
-            if (t.isAlive()) {
-                t.interrupt();
-            }
-            thread = null;
-        }
-    }
-
-    @Override
-    public void destroy() {
-        if (thread != null && thread.isAlive()) {
-            thread.interrupt();
-        }
-        thread = null;
-        receiver = null;
-        text = null;
-        range = null;
-    }
-
-    private class FormattingThread extends Thread {
-
-        @Override
-        public void run() {
-            Log.v(LOG_TAG, "AsyncFormatter thread started");
-            try {
-                while (!isInterrupted()) {
-                    lock.lock();
-                    if (text == null) {
-                        continue;
-                    }
-                    TextRange newRange;
-                    if (range == null) {
-                        newRange = formatAsync(text, cursorRange);
-                    } else {
-                        newRange = formatRegionAsync(text, range, cursorRange);
-                    }
-                    sendUpdate(text, newRange);
-                    // un-refer immediately
-                    text = null;
-                    range = null;
-                    // Wait for next time
-                    condition.await();
-                }
-            } catch (InterruptedException e) {
-                Log.v(LOG_TAG, "Thread is interrupted.");
-            } catch (Exception e) {
-                Log.e(LOG_TAG, "Unexpected exception is thrown in the thread.", e);
-                sendFailure(e);
-            }
-        }
-    }
-}
-

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/lang/format/Formatter.java

@@ -1,104 +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.format;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import io.github.abc15018045126.sora.text.Content;
-import io.github.abc15018045126.sora.text.TextRange;
-
-/**
- * Format content for editor
- */
-public interface Formatter {
-
-
-    /**
-     * Format the given content from {@code start} position to {@code end} position
-     * <p>
-     * Format the content directly, and call {@link FormatResultReceiver} to receive the formatted content from the editor when the formatting is complete
-     * *
-     *
-     * @param text        the content to format, but not the original Content in editor
-     * @param cursorRange the positions of cursor. Start and end position may be the same.
-     */
-    void format(@NonNull Content text, @NonNull TextRange cursorRange);
-
-    /**
-     * Format the given content from {@code start} position to {@code end} position
-     * <p>
-     * Format the content directly, and call {@link FormatResultReceiver} to receive the formatted content from the editor when the formatting is complete
-     *
-     * @param text          the content to format, but not the original Content in editor
-     * @param rangeToFormat the range in text to be formatted
-     * @param cursorRange   the positions of cursor. Start and end position may be the same.
-     */
-    void formatRegion(@NonNull Content text, @NonNull TextRange rangeToFormat, @NonNull TextRange cursorRange);
-
-    /**
-     * Set the result receiver
-     */
-    void setReceiver(@Nullable FormatResultReceiver receiver);
-
-    /**
-     * Whether the current formatter is running
-     */
-    boolean isRunning();
-
-    /**
-     * Destroy the formatter. Release any resources held.
-     * Make sure that you will not call the receiver anymore.
-     */
-    void destroy();
-
-    /**
-     * Cancel last task if it is still running. Do not send success/failure to editor for last task.
-     */
-    default void cancel() {
-
-    }
-
-
-    interface FormatResultReceiver {
-        /**
-         * Called when the formatting is completed
-         *
-         * @param applyContent the formatted <strong>full</strong> text
-         * @param cursorRange  The range of cursor after formatting. You may pass null for unspecified.
-         *                     Also, the start and end of the range may be the same position.
-         */
-        void onFormatSucceed(@NonNull CharSequence applyContent, @Nullable TextRange cursorRange);
-
-        /**
-         * Called when the formatting is failed
-         *
-         * @param throwable the throwable that caused formatting failed
-         */
-        void onFormatFail(@Nullable Throwable throwable);
-
-    }
-
-}
-

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/lang/smartEnter/NewlineHandleResult.java

@@ -1,47 +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.smartEnter;
-
-public class NewlineHandleResult {
-
-    /**
-     * Text to insert
-     */
-    public final CharSequence text;
-
-    /**
-     * Count to shift left from the end of {@link NewlineHandleResult#text}
-     */
-    public final int shiftLeft;
-
-    public NewlineHandleResult(CharSequence text, int shiftLeft) {
-        this.text = text;
-        this.shiftLeft = shiftLeft;
-        if (shiftLeft < 0 || shiftLeft > text.length()) {
-            throw new IllegalArgumentException("invalid shiftLeft");
-        }
-    }
-
-}
-

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/lang/smartEnter/NewlineHandler.java

@@ -1,60 +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.smartEnter;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import io.github.abc15018045126.sora.lang.styling.Styles;
-import io.github.abc15018045126.sora.text.CharPosition;
-import io.github.abc15018045126.sora.text.Content;
-
-/**
- * Perform text processing when user enters '\n' and selection size is 0
- */
-public interface NewlineHandler {
-
-    /**
-     * Checks whether the given input matches the requirement to invoke this handler
-     *
-     * @param text     Current text in editor
-     * @param position The position of cursor
-     * @param style    Current code styles
-     * @return Whether this handler should be called
-     */
-    boolean matchesRequirement(@NonNull Content text, @NonNull CharPosition position, @Nullable Styles style);
-
-    /**
-     * Handle newline and return processed content to insert
-     *
-     * @param text     Current text in editor
-     * @param position The position of cursor
-     * @param style    Current code styles
-     * @return Actual content to insert
-     */
-    @NonNull
-    NewlineHandleResult handleNewline(@NonNull Content text, @NonNull CharPosition position, @Nullable Styles style, int tabSize);
-
-}
-

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

@@ -1,60 +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.List;
-
-/**
- * Update block line positions on edit
- */
-public class BlocksUpdater {
-
-    /**
-     * Update blocks
-     *
-     * @param blocks   Block lines to update
-     * @param restrict Min line to update
-     * @param delta    Delta for line index
-     */
-    public static void update(List<CodeBlock> blocks, int restrict, int delta) {
-        if (delta == 0) {
-            return;
-        }
-        var itr = blocks.iterator();
-        while (itr.hasNext()) {
-            var block = itr.next();
-            if (block.startLine >= restrict) {
-                block.startLine += delta;
-            }
-            if (block.endLine >= restrict) {
-                block.endLine += delta;
-            }
-            if (block.startLine >= block.endLine) {
-                itr.remove();
-            }
-        }
-    }
-
-}
-

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

@@ -1,182 +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.Comparator;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Code block info model
- *
- * @author Rose
- */
-public class CodeBlock {
-
-    public static final Comparator<CodeBlock> COMPARATOR_END = (a, b) -> {
-        var res = Integer.compare(a.endLine, b.endLine);
-        if (res == 0) {
-            return Integer.compare(a.endColumn, b.endColumn);
-        } else {
-            return res;
-        }
-    };
-
-    public static final Comparator<CodeBlock> COMPARATOR_START = (a, b) -> {
-        var res = Integer.compare(a.startLine, b.startLine);
-        if (res == 0) {
-            return Integer.compare(a.startColumn, b.startColumn);
-        } else {
-            return res;
-        }
-    };
-
-    /**
-     * Performs a binary search to find the index of the smallest code block whose end line is
-     * greater than or equal to the specified line.
-     * <p>
-     * This implementation also handles the case where the elements in the list are
-     * <code>null</code>. If a null element is encountered at <code>mid</code>, we look for the
-     * first non-null element either before and after the element and set it as <code>mid</code>.
-     *
-     * @param line   The line number to search for.
-     * @param blocks The list of code blocks to search within.
-     * @return The index of the smallest code block with an end line greater than or equal to the
-     * specified line. If no matching code block is found, -1 is returned.
-     */
-    public static int binarySearchEndBlock(int line, List<CodeBlock> blocks) {
-        if (blocks == null || blocks.isEmpty()) {
-            return -1;
-        }
-
-        int left = 0, right = blocks.size() - 1, mid, row;
-        int max = right;
-
-        while (left <= right) {
-            mid = left + (right - left) / 2;
-            if (mid < 0 || mid > max) {
-                return -1;
-            }
-
-            CodeBlock block = blocks.get(mid);
-            if (block == null) {
-                int nonNullLeft = mid - 1;
-                int nonNullRight = mid + 1;
-
-                while (true) {
-                    if (nonNullLeft < left && nonNullRight > right) {
-                        return -1;
-                    } else if (nonNullLeft >= left && blocks.get(nonNullLeft) != null) {
-                        mid = nonNullLeft;
-                        break;
-                    } else if (nonNullRight <= right && blocks.get(nonNullRight) != null) {
-                        mid = nonNullRight;
-                        break;
-                    }
-                    nonNullLeft--;
-                    nonNullRight++;
-                }
-
-                block = blocks.get(mid);
-            }
-
-            row = block.endLine;
-            if (row > line) {
-                right = mid - 1;
-            } else if (row < line) {
-                left = mid + 1;
-            } else {
-                left = mid;
-                break;
-            }
-        }
-
-        if (left < 0 || left > max) {
-            return -1;
-        }
-
-        return left;
-    }
-
-    /**
-     * Start line of code block
-     */
-    public int startLine;
-    /**
-     * Start column of code block
-     */
-    public int startColumn;
-    /**
-     * End line of code block
-     */
-    public int endLine;
-    /**
-     * End column of code block
-     */
-    public int endColumn;
-    /**
-     * Indicates that this BlockLine should be drawn vertically until the bottom of its end line
-     */
-    public boolean toBottomOfEndLine;
-
-    public void clear() {
-        startColumn = startLine = endLine = endColumn = 0;
-        toBottomOfEndLine = false;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        CodeBlock codeBlock = (CodeBlock) o;
-        return startLine == codeBlock.startLine && startColumn == codeBlock.startColumn &&
-          endLine == codeBlock.endLine && endColumn == codeBlock.endColumn &&
-          toBottomOfEndLine == codeBlock.toBottomOfEndLine;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(startLine, startColumn, endLine, endColumn, toBottomOfEndLine);
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        //@formatter:off
-        return "BlockLine{" +
-                "startLine=" + startLine +
-                ", startColumn=" + startColumn +
-                ", endLine=" + endLine +
-                ", endColumn=" + endColumn +
-                ", toBottomOfEndLine=" + toBottomOfEndLine +
-                '}';
-        //@formatter:on
-    }
-}
-