chore: update with upstream changes

build-logic/convention/src/main/kotlin/Versions.kt

@@ -24,8 +24,8 @@
 @SuppressWarnings("unused")
 object Versions {
     // Project versions
-    private const val version = "0.24.4"
-    const val versionCode = 93
+    private const val version = "0.24.5"
+    const val versionCode = 94
 
     val appVersionName by lazy {
         if (CI.isCiBuild) {

build.gradle.kts

@@ -25,7 +25,9 @@
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.CommonExtension
 import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
+import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
+import com.vanniktech.maven.publish.SourcesJar
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidExtension
 
@@ -100,8 +102,8 @@ subprojects {
                 configure(
                     AndroidSingleVariantLibrary(
                         variant = "release",
-                        sourcesJar = true,
-                        publishJavadocJar = false
+                        sourcesJar = SourcesJar.Sources(),
+                        javadocJar = JavadocJar.None()
                     )
                 )
             }

editor/src/main/java/io/github/rosemoe/sora/lang/Language.java

@@ -42,13 +42,12 @@
 /**
  * Language for editor
  * <p>
- * A Language helps editor to highlight text and provide auto-completion.
+ * A Language instance helps editor to highlight text and provide auto-completion.
  * Implement this interface when you want to add new language support for editor.
  * <p>
  * <strong>NOTE:</strong> A language must not be single instance.
  * One language instance should always serve for only one editor.
- * It means that you should not give one language object to other editor instances
- * after it has been applied to one editor.
+ * It means that you should not pass a language object to multiple editor instances.
  *
  * @author Rosemoe
  */
@@ -80,7 +79,7 @@ public interface Language {
 
     /**
      * Get {@link AnalyzeManager} of the language.
-     * This is called from time to time by the editor. Cache your instance please.
+     * The result instance is expected to be the same in language lifecycle.
      */
     @NonNull
     AnalyzeManager getAnalyzeManager();
@@ -96,6 +95,7 @@ public interface Language {
 
     /**
      * Request to auto-complete the code at the given {@code position}.
+     * Note that if you did not correctly set the spans for the text, the auto-completion will not be triggered.
      * This is called in a worker thread other than UI thread.
      *
      * @param content        Read-only reference of content

editor/src/main/java/io/github/rosemoe/sora/lang/analysis/AsyncIncrementalAnalyzeManager.java

@@ -69,6 +69,8 @@ public abstract class AsyncIncrementalAnalyzeManager<S, T> extends BaseAnalyzeMa
 
     private static boolean useShallowCopyByDefault = false;
 
+    private static boolean updateStylesDuringAnalysis = true;
+
     /**
      * Use shallow copy for initial text copying. Memory usage will be much lower than full copy at the beginning.
      * <p>
@@ -88,6 +90,18 @@ public static boolean isUseShallowCopyByDefault() {
         return useShallowCopyByDefault;
     }
 
+    /**
+     * Update styles during initial styles analysis. This is useful for long files to show analyzed
+     * lines quickly, instead of showing the result after initial analysis.
+     */
+    public static void setUpdateStylesDuringAnalysis(boolean sendStylesAsAnalysis) {
+        AsyncIncrementalAnalyzeManager.updateStylesDuringAnalysis = sendStylesAsAnalysis;
+    }
+
+    public static boolean isUpdateStylesDuringAnalysis() {
+        return updateStylesDuringAnalysis;
+    }
+
     public AsyncIncrementalAnalyzeManager() {
         this(isUseShallowCopyByDefault());
     }
@@ -487,6 +501,11 @@ private void initialize() {
                 states.add(result.clearSpans());
                 onAddState(result.state);
                 mdf.addLineAt(i, spans);
+                if (isUpdateStylesDuringAnalysis() && i > 0 && i % 1000 == 0 && !abort) {
+                    var tmpStyles = new Styles();
+                    tmpStyles.spans = styles.spans;
+                    sendNewStyles(tmpStyles);
+                }
             }
             styles.blocks = computeBlocks(shadowed, delegate);
             styles.setSuppressSwitch(delegate.suppressSwitch);

editor/src/main/java/io/github/rosemoe/sora/lang/styling/Styles.java

@@ -136,7 +136,8 @@ public void setSuppressSwitch(int suppressSwitch) {
      * Adjust styles on insert.
      */
     public void adjustOnInsert(@NonNull CharPosition start, @NonNull CharPosition end) {
-        spans.adjustOnInsert(start, end);
+        if (spans != null)
+            spans.adjustOnInsert(start, end);
         var delta = end.line - start.line;
         if (delta == 0) {
             return;
@@ -157,7 +158,8 @@ public void adjustOnInsert(@NonNull CharPosition start, @NonNull CharPosition en
      * Adjust styles on delete.
      */
     public void adjustOnDelete(@NonNull CharPosition start, @NonNull CharPosition end) {
-        spans.adjustOnDelete(start, end);
+        if (spans != null)
+            spans.adjustOnDelete(start, end);
         var delta = start.line - end.line;
         if (delta == 0) {
             return;

editor/src/main/java/io/github/rosemoe/sora/widget/DirectAccessProps.java

@@ -35,6 +35,7 @@
 
 import io.github.rosemoe.sora.annotations.Experimental;
 import io.github.rosemoe.sora.annotations.InvalidateRequired;
+import io.github.rosemoe.sora.widget.minimap.MinimapConfig;
 
 /**
  * Direct-access properties.
@@ -568,4 +569,19 @@ public class DirectAccessProps implements Serializable {
      */
     public boolean selectCompletionItemOnEnterForSoftKbd = true;
 
+    /**
+     * Show minimap for content
+     */
+    @Experimental
+    @InvalidateRequired
+    public boolean showMinimap = false;
+
+    /**
+     * Minimap config
+     */
+    @Experimental
+    @InvalidateRequired
+    @NonNull
+    public MinimapConfig minimapConfig = MinimapConfig.Companion.getDefaultConfig();
+
 }

editor/src/main/java/io/github/rosemoe/sora/widget/EditorRenderer.java

@@ -90,6 +90,7 @@
 import io.github.rosemoe.sora.util.TemporaryCharBuffer;
 import io.github.rosemoe.sora.widget.layout.Row;
 import io.github.rosemoe.sora.widget.layout.RowIterator;
+import io.github.rosemoe.sora.widget.minimap.MinimapRenderer;
 import io.github.rosemoe.sora.widget.rendering.RenderingConstants;
 import io.github.rosemoe.sora.widget.rendering.TextAdvancesCache;
 import io.github.rosemoe.sora.widget.schemes.EditorColorScheme;
@@ -144,6 +145,7 @@ public class EditorRenderer {
     protected Content content;
     private volatile boolean renderingFlag;
     protected boolean forcedRecreateLayout;
+    private final MinimapRenderer minimapRenderer;
 
     public EditorRenderer(@NonNull CodeEditor editor) {
         this.editor = editor;
@@ -172,6 +174,7 @@ public EditorRenderer(@NonNull CodeEditor editor) {
         lineBreakGraph = editor.getContext().getDrawable(R.drawable.line_break);
         softwrapLeftGraph = editor.getContext().getDrawable(R.drawable.softwrap_left);
         softwrapRightGraph = editor.getContext().getDrawable(R.drawable.softwrap_right);
+        minimapRenderer = new MinimapRenderer(editor);
 
         onEditorFullTextUpdate();
     }
@@ -509,7 +512,7 @@ public void drawView(Canvas canvas) {
         canvas.save();
         float stuckLineBottom = getStuckLineBottom(stuckLines);
         canvas.clipRect(0, stuckLineBottom, editor.getWidth(), editor.getHeight());
-        drawRows(canvas, textOffset, postDrawLineNumbers, postDrawCursor, postDrawCurrentLines, firstLn);
+        drawRows(canvas, textOffset, postDrawLineNumbers, postDrawCursor, postDrawCurrentLines, firstLn, stuckLines);
         patchHighlightedDelimiters(canvas, textOffset);
         drawDiagnosticIndicators(canvas, offsetX);
         canvas.restore();
@@ -629,7 +632,7 @@ public void drawView(Canvas canvas) {
         }
 
         drawStuckLineNumbers(canvas, stuckLines, offsetX, lineNumberWidth, editor.getColorScheme().getColor(EditorColorScheme.LINE_NUMBER));
-        drawScrollBars(canvas);
+        drawScrollBarsAndMinimap(canvas);
         drawEdgeEffect(canvas);
 
         releasePreloadedData();
@@ -1140,7 +1143,9 @@ public TextRowParams createTextRowParams() {
      * @param postDrawLineNumbers Line numbers to be drawn later
      * @param postDrawCursor      Cursors to be drawn later
      */
-    protected void drawRows(Canvas canvas, float offset, LongArrayList postDrawLineNumbers, List<DrawCursorTask> postDrawCursor, MutableIntList postDrawCurrentLines, MutableInt requiredFirstLn) {
+    protected void drawRows(Canvas canvas, float offset, LongArrayList postDrawLineNumbers,
+                            List<DrawCursorTask> postDrawCursor, MutableIntList postDrawCurrentLines,
+                            MutableInt requiredFirstLn, List<CodeBlock> stuckLines) {
         int firstVis = editor.getFirstVisibleRow();
         RowIterator rowIterator = editor.getLayout().obtainRowIterator(firstVis, preloadedLines);
         Spans spans = editor.getStyles() == null ? null : editor.getStyles().spans;
@@ -1165,7 +1170,7 @@ protected void drawRows(Canvas canvas, float offset, LongArrayList postDrawLineN
             circleRadius = Math.min(editor.getRowHeight(), spaceWidth) * RenderingConstants.NON_PRINTABLE_CIRCLE_RADIUS_FACTOR;
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && !editor.isWordwrap() && canvas.isHardwareAccelerated() && editor.isHardwareAcceleratedDrawAllowed()) {
-            editor.getRenderContext().getRenderNodeHolder().keepCurrentInDisplay(firstVis, editor.getLastVisibleRow());
+            editor.getRenderContext().getRenderNodeHolder().keepCurrentInDisplay(firstVis, editor.getLastVisibleRow(), stuckLines);
         }
         float offset2 = editor.getOffsetX() - editor.measureTextRegionOffset();
 
@@ -2041,18 +2046,17 @@ protected void drawSideBlockLine(Canvas canvas) {
      *
      * @param canvas The canvas to draw
      */
-    protected void drawScrollBars(Canvas canvas) {
+    protected void drawScrollBarsAndMinimap(Canvas canvas) {
+        var minimapWidth = minimapRenderer.onDrawToCanvas(canvas, editor.getWidth(), displayTimestamp);
         verticalScrollBarRect.setEmpty();
         horizontalScrollBarRect.setEmpty();
-        if (!editor.getEventHandler().shouldDrawScrollBarForTouch() && !(editor.isInMouseMode() && editor.getProps().mouseModeAlwaysShowScrollbars)) {
-            return;
-        }
+        boolean shouldShowScrollbars = editor.getEventHandler().shouldDrawScrollBarForTouch() || (editor.isInMouseMode() && editor.getProps().mouseModeAlwaysShowScrollbars);
         var percentage = editor.getEventHandler().getScrollBarFadeOutPercentageForTouch();
-        if (editor.isInMouseMode() && editor.getProps().mouseModeAlwaysShowScrollbars) {
+        if (shouldShowScrollbars && editor.isInMouseMode() && editor.getProps().mouseModeAlwaysShowScrollbars) {
             percentage = 0f;
         }
         var size = editor.getDpUnit() * RenderingConstants.SCROLLBAR_WIDTH_DIP;
-        if (editor.isHorizontalScrollBarEnabled() && !editor.isWordwrap() && editor.getScrollMaxX() > editor.getWidth() * 3 / 4) {
+        if (shouldShowScrollbars && editor.isHorizontalScrollBarEnabled() && !editor.isWordwrap() && editor.getScrollMaxX() > editor.getWidth() * 3 / 4) {
             canvas.save();
             canvas.translate(0f, size * percentage);
 
@@ -2061,7 +2065,8 @@ protected void drawScrollBars(Canvas canvas) {
 
             canvas.restore();
         }
-        if (editor.isVerticalScrollBarEnabled() && editor.getScrollMaxY() > editor.getHeight() / 2) {
+        boolean shouldShowVerticalScrollbar = shouldShowScrollbars && !editor.getProps().showMinimap;
+        if (shouldShowVerticalScrollbar && editor.isVerticalScrollBarEnabled() && editor.getScrollMaxY() > editor.getHeight() / 2) {
             canvas.save();
             canvas.translate(size * percentage, 0f);
 
@@ -2070,6 +2075,14 @@ protected void drawScrollBars(Canvas canvas) {
 
             canvas.restore();
         }
+
+        if (minimapWidth != 0) {
+            getVerticalScrollBarRect(tmpRect, minimapWidth);
+            verticalScrollBarRect.set(tmpRect);
+            if (editor.getEventHandler().holdVerticalScrollBar()) {
+                drawLineInfoPanel(canvas, tmpRect.top, tmpRect.height(), minimapWidth + 5 * editor.getDpUnit());
+            }
+        }
     }
 
     /**
@@ -2092,27 +2105,33 @@ protected void drawScrollBarTrackVertical(Canvas canvas) {
         }
     }
 
+    private void getVerticalScrollBarRect(RectF rect, float width) {
+        int height = editor.getHeight();
+        float all = editor.getScrollMaxY() + height;
+        float length = Math.max(height / all * height, editor.getDpUnit() * RenderingConstants.SCROLLBAR_LENGTH_MIN_DIP);
+        float topY = editor.getOffsetY() * 1.0f / editor.getScrollMaxY() * (height - length);
+        rect.right = editor.getWidth();
+        rect.left = editor.getWidth() - width;
+        rect.top = topY;
+        rect.bottom = topY + length;
+    }
+
     /**
      * Draw vertical scroll bar
      *
      * @param canvas Canvas to draw
      */
     protected void drawScrollBarVertical(Canvas canvas) {
-        int height = editor.getHeight();
-        float all = editor.getScrollMaxY() + height;
-        float length = Math.max(height / all * height, editor.getDpUnit() * RenderingConstants.SCROLLBAR_LENGTH_MIN_DIP);
-        float topY = editor.getOffsetY() * 1.0f / editor.getScrollMaxY() * (height - length);
+        getVerticalScrollBarRect(tmpRect, editor.getDpUnit() * RenderingConstants.SCROLLBAR_WIDTH_DIP);
+        verticalScrollBarRect.set(tmpRect);
         if (editor.getEventHandler().holdVerticalScrollBar()) {
-            drawLineInfoPanel(canvas, topY, length);
+            drawLineInfoPanel(canvas, tmpRect.top, tmpRect.height(), 30 * editor.getDpUnit());
         }
-        tmpRect.right = editor.getWidth();
-        tmpRect.left = editor.getWidth() - editor.getDpUnit() * RenderingConstants.SCROLLBAR_WIDTH_DIP;
-        tmpRect.top = topY;
-        tmpRect.bottom = topY + length;
-        verticalScrollBarRect.set(tmpRect);
         if (verticalScrollbarThumbDrawable != null) {
             verticalScrollbarThumbDrawable.setState(editor.getEventHandler().holdVerticalScrollBar() ? PRESSED_DRAWABLE_STATE : DEFAULT_DRAWABLE_STATE);
-            verticalScrollbarThumbDrawable.setBounds((int) tmpRect.left, (int) tmpRect.top, (int) tmpRect.right, (int) tmpRect.bottom);
+            verticalScrollbarThumbDrawable.setBounds((int) verticalScrollBarRect.left,
+                    (int) verticalScrollBarRect.top, (int) verticalScrollBarRect.right,
+                    (int) verticalScrollBarRect.bottom);
             verticalScrollbarThumbDrawable.draw(canvas);
         } else {
             drawColor(canvas, editor.getColorScheme().getColor(editor.getEventHandler().holdVerticalScrollBar() ? EditorColorScheme.SCROLL_BAR_THUMB_PRESSED : EditorColorScheme.SCROLL_BAR_THUMB), tmpRect);
@@ -2126,7 +2145,7 @@ protected void drawScrollBarVertical(Canvas canvas) {
      * @param topY   The y at the top of the vertical scrollbar
      * @param length The length of vertical scrollbar
      */
-    protected void drawLineInfoPanel(Canvas canvas, float topY, float length) {
+    protected void drawLineInfoPanel(Canvas canvas, float topY, float length, float rightMargin) {
         if (!editor.isDisplayLnPanel()) {
             return;
         }
@@ -2173,8 +2192,8 @@ protected void drawLineInfoPanel(Canvas canvas, float topY, float length) {
             drawColorRound(canvas, editor.getColorScheme().getColor(EditorColorScheme.LINE_NUMBER_PANEL), tmpRect);
         } else {
             float[] radii = null;
-            tmpRect.right = editor.getWidth() - 30 * editor.getDpUnit();
-            tmpRect.left = editor.getWidth() - 30 * editor.getDpUnit() - expand * 2 - textWidth;
+            tmpRect.right = editor.getWidth() - rightMargin;
+            tmpRect.left = tmpRect.right - expand * 2 - textWidth;
             if (position == LineInfoPanelPosition.TOP) {
                 tmpRect.top = topY;
                 tmpRect.bottom = topY + editor.getRowHeight() + 2 * expand;

editor/src/main/java/io/github/rosemoe/sora/widget/EditorSearcher.java

@@ -77,6 +77,7 @@ public class EditorSearcher {
      */
     protected LongArrayList lastResults;
     private boolean cyclicJumping = true;
+    private boolean ensureOccurrenceVisible = false;
 
     EditorSearcher(@NonNull CodeEditor editor) {
         this.editor = editor;
@@ -104,6 +105,23 @@ public boolean isCyclicJumping() {
         return cyclicJumping;
     }
 
+    /**
+     * Set whether the editor should automatically scroll to the nearest occurrence
+     * when executing a search.
+     *
+     * @see #isEnsureOccurrenceVisible()
+     */
+    public void setEnsureOccurrenceVisible(boolean ensureOccurrenceVisible) {
+        this.ensureOccurrenceVisible = ensureOccurrenceVisible;
+    }
+
+    /**
+     * @see #setEnsureOccurrenceVisible(boolean)
+     */
+    public boolean isEnsureOccurrenceVisible() {
+        return ensureOccurrenceVisible;
+    }
+
     /**
      * Set the options when replacing text
      */
@@ -611,6 +629,19 @@ public void run() {
                         editor.invalidate();
                         editor.dispatchEvent(new PublishSearchResultEvent(editor));
                         currentThread = null;
+                        if (ensureOccurrenceVisible && results.size() > 0) {
+                            var right = editor.getCursor().getRight();
+                            var index = results.lowerBoundByFirst(right);
+
+                            if (index >= results.size()) {
+                                index = results.size() - 1;
+                            }
+
+                            var match = results.get(index);
+                            var start = IntPair.getFirst(match);
+                            var startPos = editor.getText().getIndexer().getCharPosition(start);
+                            editor.ensurePositionVisible(startPos.line, startPos.column);
+                        }
                     }
                 });
             }