capacitor-sora-editor 1.2.1 → 1.8.2

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/lang/brackets/SimpleBracketsCollector.java

@@ -1,83 +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.brackets;
-
-import android.util.SparseIntArray;
-
-import androidx.annotation.NonNull;
-
-import io.github.abc15018045126.sora.text.Content;
-
-/**
- * Collect brackets for simple languages. Not very effective. Not thread-safe.
- *
- * @author abc15018045126
- */
-public class SimpleBracketsCollector implements BracketsProvider {
-
-    private final SparseIntArray mapping;
-
-    public SimpleBracketsCollector() {
-        mapping = new SparseIntArray();
-    }
-
-    /**
-     * Add new pair
-     */
-    public void add(int start, int end) {
-        // add 1 to avoid zeros
-        mapping.put(start + 1, end + 1);
-        mapping.put(end + 1, start + 1);
-    }
-
-    /**
-     * Remove all pairs
-     */
-    public void clear() {
-        mapping.clear();
-    }
-
-    private PairedBracket getForIndex(int index) {
-        int another = mapping.get(index + 1) - 1;
-        if (another > index) {
-            int tmp = index;
-            index = another;
-            another = tmp;
-        }
-        if (another != -1) {
-            return new PairedBracket(index, another);
-        }
-        return null;
-    }
-
-    @Override
-    public PairedBracket getPairedBracketAt(@NonNull Content text, int index) {
-        var res = index - 1 >= 0 ? getForIndex(index - 1) : null;
-        if (res == null) {
-            res = getForIndex(index);
-        }
-        return res;
-    }
-}
-

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/lang/completion/CompletionCancelledException.java

@@ -1,44 +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.completion;
-
-/**
- * Thrown when the thread is abandoned by the editor framework because the editor do not need its
- * new items anymore.
- * <p>
- * This can be thrown by {@link io.github.abc15018045126.sora.text.ContentReference} and
- * {@link CompletionPublisher}.
- *
- * @author abc15018045126
- */
-public class CompletionCancelledException extends RuntimeException {
-
-    public CompletionCancelledException() {
-    }
-
-    public CompletionCancelledException(String message) {
-        super(message);
-    }
-}
-

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/lang/completion/CompletionHelper.java

@@ -1,72 +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.completion;
-
-import io.github.abc15018045126.sora.text.CharPosition;
-import io.github.abc15018045126.sora.text.ContentReference;
-import io.github.abc15018045126.sora.widget.component.EditorAutoCompletion;
-
-/**
- * Helper class for completion
- *
- * @author abc15018045126
- */
-public class CompletionHelper {
-
-    /**
-     * Searches backward on the line, with the given checker to check chars.
-     * Returns the longest text that matches the requirement
-     */
-    public static String computePrefix(ContentReference ref, CharPosition pos, PrefixChecker checker) {
-        int begin = pos.column;
-        var line = ref.getLine(pos.line);
-        for (; begin > 0; begin--) {
-            if (!checker.check(line.charAt(begin - 1))) {
-                break;
-            }
-        }
-        return line.substring(begin, pos.column);
-    }
-
-    /**
-     * Check whether the thread is abandoned by editor.
-     * Return true if it is cancelled by editor.
-     */
-    public static boolean checkCancelled() {
-        var thread = Thread.currentThread();
-        if (thread instanceof EditorAutoCompletion.CompletionThread) {
-            return ((EditorAutoCompletion.CompletionThread) thread).isCancelled();
-        } else {
-            return false;
-        }
-    }
-
-    public interface PrefixChecker {
-
-        boolean check(char ch);
-
-    }
-
-}
-

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/lang/completion/CompletionItem.java

@@ -1,163 +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.completion;
-
-import android.graphics.drawable.Drawable;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import io.github.abc15018045126.sora.text.CharPosition;
-import io.github.abc15018045126.sora.text.Content;
-import io.github.abc15018045126.sora.widget.CodeEditor;
-
-/**
- * The class used to save auto complete result items.
- * For functionality, this class only manages the information to be displayed in list view.
- * You can implement {@link CompletionItem#performCompletion(CodeEditor, Content, int, int)} or
- * {@link CompletionItem#performCompletion(CodeEditor, Content, CharPosition)} to customize
- * your own completion method so that you can develop complex actions.
- * <p>
- * For the simplest usage, see {@link SimpleCompletionItem}
- *
- * @author abc15018045126
- * @see SimpleCompletionItem
- */
-@SuppressWarnings("CanBeFinal")
-public abstract class CompletionItem {
-
-    /**
-     * Icon for displaying in adapter
-     */
-    @Nullable
-    public Drawable icon;
-
-    /**
-     * Text to display as title in adapter
-     */
-    public CharSequence label;
-
-    /**
-     * Text to display as description in adapter
-     */
-    public CharSequence desc;
-
-    /**
-     * The kind of this completion item. Based on the kind
-     * an icon is chosen by the editor.
-     */
-    @Nullable
-    public CompletionItemKind kind;
-
-    /**
-     * Use for default sort
-     */
-    public int prefixLength = 0;
-
-    /**
-     * A string that should be used when comparing this item
-     * with other items. When null the {@link #label label}
-     * is used.
-     */
-    @Nullable
-    public String sortText;
-
-    /**
-     * A string that should be used when comparing this item
-     * with other items. When null the {@link #sortText sortText}
-     * is used.
-     */
-    @Nullable
-    public String filterText;
-
-    @Nullable
-    protected Object extra;
-
-    public CompletionItem(CharSequence label) {
-        this(label, null);
-    }
-
-    public CompletionItem(CharSequence label, CharSequence desc) {
-        this(label, desc, null);
-    }
-
-    public CompletionItem(CharSequence label, CharSequence desc, Drawable icon) {
-        this.label = label;
-        this.desc = desc;
-        this.icon = icon;
-    }
-
-    public CompletionItem label(CharSequence label) {
-        this.label = label;
-        return this;
-    }
-
-    public CompletionItem desc(CharSequence desc) {
-        this.desc = desc;
-        return this;
-    }
-
-    public CompletionItem kind(CompletionItemKind kind) {
-        this.kind = kind;
-        return this;
-    }
-
-    public CompletionItem icon(Drawable icon) {
-        this.icon = icon;
-        return this;
-    }
-
-    /**
-     * Perform this completion.
-     * You can implement custom logic to make your completion better(by updating selection and text
-     * from here).
-     * To make it considered as a single action, the editor will enter batch edit state before invoking
-     * this method. Feel free to update the text by multiple calls to {@code text}.
-     *
-     * @param editor   The editor. You can set cursor position with that.
-     * @param text     The text in editor. You can make modifications to it.
-     * @param position The requested completion position (the one passed to completion thread)
-     */
-    public void performCompletion(@NonNull CodeEditor editor, @NonNull Content text, @NonNull CharPosition position) {
-        performCompletion(editor, text, position.line, position.column);
-    }
-
-    /**
-     * Perform this completion.
-     * You can implement custom logic to make your completion better(by updating selection and text
-     * from here).
-     * To make it considered as a single action, the editor will enter batch edit state before invoking
-     * this method. Feel free to update the text by multiple calls to {@code text}.
-     *
-     * @param editor The editor. You can set cursor position with that.
-     * @param text   The text in editor. You can make modifications to it.
-     * @param line   The auto-completion line
-     * @param column The auto-completion column
-     * @see #performCompletion(CodeEditor, Content, CharPosition) Editor calls this method to do completion
-     */
-    public abstract void performCompletion(@NonNull CodeEditor editor, @NonNull Content text, int line, int column);
-
-}
-
-

package/android/sora-editor/editor/src/main/java/io/github/abc15018045126/sora/lang/completion/CompletionPublisher.java

@@ -1,284 +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.completion;
-
-import android.os.Handler;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import io.github.abc15018045126.sora.annotations.UnsupportedUserUsage;
-import io.github.abc15018045126.sora.lang.Language;
-
-/**
- * CompletionPublisher manages completion items to be added in one completion analyzing process.
- * <p>
- * You can only add items to the publisher, but no deletion is allowed. As you add more items, the
- * publisher will update the list in UI from time to time, which is related to your threshold
- * settings.({@link CompletionPublisher#setUpdateThreshold(int)}).
- * There will usually be some items not displayed in screen when the thread is still running. Even
- * when the actual pending item count exceeds the threshold you set, there may still be some items
- * not committed because of lock failures. You can use {@link CompletionPublisher#updateList(boolean)}
- * with forced flag to command the UI thread update the completion list, by waiting for the lock from
- * your side to release.
- * If you want to disable this feature, you may want to set it to {@link Integer#MAX_VALUE}
- * <p>
- * You can set a comparator by {@link CompletionPublisher#setComparator(Comparator)} to sort your
- * result items, but you should not make it too complex, which will cause laggy in UI thread. It is
- * recommended that you set the comparator before all your actions.
- * Leaving the comparator null results the completion to be unsorted. They will be ordered by the order
- * you add them.
- * <p>
- * After all you additions, you do not need to explicitly invoke {@link CompletionPublisher#updateList(boolean)}.
- * This will automatically be called by editor framework.
- * <p>
- * Note that your actions may be interrupted because of {@link Thread#interrupted()}.
- */
-public class CompletionPublisher {
-
-    /**
-     * Default value for {@link CompletionPublisher#setUpdateThreshold(int)}
-     */
-    public final static int DEFAULT_UPDATE_THRESHOLD = 5;
-    private final List<CompletionItem> items;
-    private final List<CompletionItem> candidates;
-    private final Lock lock;
-    private final Handler handler;
-    private final Runnable callback;
-    private final int languageInterruptionLevel;
-    private Comparator<CompletionItem> comparator;
-    private int updateThreshold;
-    private boolean invalid = false;
-
-    public CompletionPublisher(@NonNull Handler handler, @NonNull Runnable callback, int languageInterruptionLevel) {
-        this.handler = handler;
-        this.items = new ArrayList<>();
-        this.candidates = new ArrayList<>();
-        lock = new ReentrantLock(true);
-        updateThreshold = DEFAULT_UPDATE_THRESHOLD;
-        this.callback = callback;
-        this.languageInterruptionLevel = languageInterruptionLevel;
-    }
-
-    /**
-     * Checks whether there is data
-     */
-    public boolean hasData() {
-        return items.size() + candidates.size() > 0;
-    }
-
-    /**
-     * Get items currently in display
-     */
-    @UnsupportedUserUsage
-    public List<CompletionItem> getItems() {
-        return items;
-    }
-
-    /**
-     * Set the max pending items in analyzing thread.
-     * See class javadoc for more information.
-     */
-    public void setUpdateThreshold(int updateThreshold) {
-        this.updateThreshold = updateThreshold;
-    }
-
-    /**
-     * Set the result's comparator.
-     * <p>
-     * The comparator is used when publishing the completion to user.
-     */
-    public void setComparator(@Nullable Comparator<CompletionItem> comparator) {
-        checkCancelled();
-        if (invalid) {
-            return;
-        }
-        this.comparator = comparator;
-        if (!items.isEmpty() && comparator != null) {
-            handler.post(() -> {
-                if (invalid) {
-                    return;
-                }
-                Collections.sort(items, comparator);
-                callback.run();
-            });
-        }
-    }
-
-    /**
-     * Add items in the completion list.
-     * <p>
-     * According to your settings and the lock's state, these items may not immediately
-     * be displayed to the user.
-     *
-     * @see CompletionPublisher#setUpdateThreshold(int)
-     */
-    public void addItems(Collection<CompletionItem> items) {
-        checkCancelled();
-        if (invalid) {
-            return;
-        }
-        lock.lock();
-        try {
-            candidates.addAll(items);
-        } finally {
-            lock.unlock();
-        }
-        if (candidates.size() >= updateThreshold) {
-            updateList();
-        }
-    }
-
-    /**
-     * Add a single item in completion list.
-     * <p>
-     * According to your settings and the lock's state, this item may not immediately
-     * be displayed to the user.
-     *
-     * @see CompletionPublisher#setUpdateThreshold(int)
-     */
-    public void addItem(CompletionItem item) {
-        checkCancelled();
-        if (invalid) {
-            return;
-        }
-        lock.lock();
-        try {
-            candidates.add(item);
-        } finally {
-            lock.unlock();
-        }
-        if (candidates.size() >= updateThreshold) {
-            updateList();
-        }
-    }
-
-    /**
-     * Try to update completion in main thread.
-     * <p>
-     * If {@link Lock#tryLock()} failed, nothing will happen.
-     */
-    public void updateList() {
-        updateList(false);
-    }
-
-    /**
-     * Update completion items on main thread
-     *
-     * @param forced If true, the main thread will wait for the lock. Otherwise, when the lock is
-     *               currently available for the thread, the update will be executed.
-     */
-    public void updateList(boolean forced) {
-        if (invalid) {
-            return;
-        }
-        handler.post(() -> {
-            // Lock the candidate list accordingly
-            if (invalid) {
-                callback.run();
-                return;
-            }
-            var locked = false;
-            if (forced) {
-                lock.lock();
-                locked = true;
-            } else {
-                locked = lock.tryLock();
-            }
-
-            if (locked) {
-                try {
-                    if (candidates.isEmpty()) {
-                        callback.run();
-                        return;
-                    }
-                    final var comparator = this.comparator;
-                    if (comparator != null) {
-                        while (!candidates.isEmpty()) {
-                            var candidate = candidates.remove(0);
-                            // Insert the value by binary search
-                            int left = 0, right = items.size();
-                            var size = right;
-                            while (left <= right) {
-                                var mid = (left + right) / 2;
-                                if (mid < 0 || mid >= size) {
-                                    left = mid;
-                                    break;
-                                }
-                                var cmp = comparator.compare(items.get(mid), candidate);
-                                if (cmp < 0) {
-                                    left = mid + 1;
-                                } else if (cmp > 0) {
-                                    right = mid - 1;
-                                } else {
-                                    left = mid;
-                                    break;
-                                }
-                            }
-                            left = Math.max(0, Math.min(size, left));
-                            items.add(left, candidate);
-                        }
-                    } else {
-                        items.addAll(candidates);
-                        candidates.clear();
-                    }
-                    callback.run();
-                } finally {
-                    lock.unlock();
-                }
-            }
-        });
-    }
-
-
-    /**
-     * Cancel the completion
-     */
-    public void cancel() {
-        invalid = true;
-    }
-
-    /**
-     * Check whether the completion is cancelled. If so, an instance of {@link CompletionCancelledException}
-     * is thrown.
-     */
-    public void checkCancelled() {
-        if (Thread.interrupted() || invalid) {
-            invalid = true;
-            if (languageInterruptionLevel <= Language.INTERRUPTION_LEVEL_SLIGHT) {
-                throw new CompletionCancelledException();
-            }
-        }
-    }
-
-}
-