fix: conflict

Author: RohitKushvaha01

.github/workflows/gradle.yml

@@ -23,6 +23,8 @@ jobs:
 
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "oniguruma-native/src/main/cpp/oniguruma"]
+	path = oniguruma-native/src/main/cpp/oniguruma
+	url = git@github.com:kkos/oniguruma.git

app/build.gradle.kts

@@ -97,6 +97,7 @@ dependencies {
     implementation(projects.languageMonarch)
     implementation(projects.editorLsp)
     implementation(projects.languageTreesitter)
+    implementation(projects.onigurumaNative)
 
     // Tree-sitter languages
     implementation(libs.tree.sitter.java)

editor/src/main/java/io/github/rosemoe/sora/graphics/GraphemeBoundsBreaker.java

@@ -23,9 +23,16 @@
  */
 package io.github.rosemoe.sora.graphics;
 
-
+/**
+ * Utility for breaking text by grapheme bounds
+ *
+ * @author Rosemoe
+ */
 public class GraphemeBoundsBreaker {
 
+    /**
+     * Find next grapheme break point before the given width
+     */
     public static int findGraphemeBreakPoint(float[] advances, int length, int width, int start) {
         float currentWidth = 0;
         int next = start;

editor/src/main/java/io/github/rosemoe/sora/graphics/GraphicsCompat.java

@@ -33,7 +33,8 @@ public class GraphicsCompat {
 
     /**
      * {@link Canvas#drawTextRun(char[], int, int, int, int, float, float, boolean, android.graphics.Paint)} is also available on API 21 & 22,
-     * but with hidden access. As there is no hidden list checks in those API platforms, it's safe here to call the "New API".
+     * but with hidden access.
+     * As there is no hidden list checks in those API platforms, it's safe here to call the "New API".
      */
     @SuppressLint("NewApi")
     public static void drawTextRun(Canvas canvas, @NonNull char[] text, int index, int count, int contextIndex,