Merge remote-tracking branch 'upstream/main'

Author: RohitKushvaha01

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

@@ -978,6 +978,17 @@ private float handleSingleTextElement(RowElement e, ListPointers pointers,
                         }
                         ctx.maxOffset = 0f;
                     }
+                    if (ctx.targetHorizontalOffset != -1f) {
+                        float runOffset = ctx.targetHorizontalOffset - offset - localOffset;
+                        if (isRtl) {
+                            runOffset = tabWidth - runOffset;
+                        }
+                        if (runOffset > tabWidth / 2f) {
+                            ctx.resultCharOffset = index + 1;
+                        } else {
+                            ctx.resultCharOffset = index;
+                        }
+                    }
                     if (ctx.regionBuffer != null && index >= ctx.startCharOffset && index < ctx.endCharOffset) {
                         ctx.regionBuffer.commitRegion(offset + localOffset, offset + localOffset + tabWidth);
                     }

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

@@ -1769,14 +1769,14 @@ public void indentLines(boolean onlyIfSelected) {
             final var requiredSpaces = tabWidth - (spaces % tabWidth);
             if (spaceCount > 0 && tabCount > 0) {
                 // indentation contains spaces as well as tabs
-                // replace the leading indentation with appropriate indendation (according to language.useTabs())
+                // replace the leading indentation with appropriate indentation (according to language.useTabs())
                 // this should be done while incrementing the indentation
                 final var finalSpaceCount = ((requiredSpaces == 0 ? tabWidth : requiredSpaces) + spaces) / tabWidth;
                 text.replace(i, 0, i, endColumn, StringsKt.repeat(tabString, finalSpaceCount));
                 continue;
             }
 
-            if (requiredSpaces == 0) {
+            if (requiredSpaces == tabWidth) {
                 // line is evenly indented
                 // increase the indentation by \t or tabWidthSpaces
                 text.insert(i, endColumn, tabString);
@@ -1818,7 +1818,7 @@ public void unindentSelection() {
             final var extraSpaces = spaces % tabWidth;
             if (spaceCount > 0 && tabCount > 0) {
                 // indentation contains spaces as well as tabs
-                // replace the leading indentation with appropriate indendation (according to language.useTabs())
+                // replace the leading indentation with appropriate indentation (according to language.useTabs())
                 // this should be done while decrementing the indentation
                 final var finalSpaceCount = Math.abs(spaces - (extraSpaces == 0 ? tabWidth : extraSpaces)) / tabWidth;
                 text.replace(i, 0, i, endColumn, StringsKt.repeat(tabString, finalSpaceCount));
@@ -1846,6 +1846,10 @@ public void unindentSelection() {
      */
     protected void commitTab() {
         if (inputConnection != null && isEditable()) {
+            if (inputConnection.composingText.isComposing()) {
+                // This external change will damage the composing text (#784)
+                restartInput();
+            }
             inputConnection.commitTextInternal(createTabString(), true);
         }
     }
@@ -1913,6 +1917,11 @@ public float updateCursorAnchor() {
             matrix.postTranslate(b[0], b[1]);
             builder.setMatrix(matrix);
             builder.setSelectionRange(cursor.getLeft(), cursor.getRight());
+
+            var composingText = inputConnection.composingText;
+            if (composingText.isComposing()) {
+                builder.setComposingText(composingText.startIndex, text.substring(composingText.startIndex, composingText.endIndex));
+            }
             builder.setInsertionMarkerLocation(x, getRowTop(l) - getOffsetY(), getRowBaseline(l) - getOffsetY(), getRowBottom(l) - getOffsetY(), visible ? CursorAnchorInfo.FLAG_HAS_VISIBLE_REGION : CursorAnchorInfo.FLAG_HAS_INVISIBLE_REGION);
             inputMethodManager.updateCursorAnchorInfo(this, builder.build());
         }

gradle/libs.versions.toml

@@ -26,7 +26,7 @@ junit = { module = "junit:junit", version = "4.13.2" }
 gson = { module = "com.google.code.gson:gson", version = "2.13.2" }
 jcodings = { module = "org.jruby.jcodings:jcodings", version = "1.0.63" }
 joni = { module = "org.jruby.joni:joni", version = "2.2.6" }
-snakeyaml-engine = { module = "org.snakeyaml:snakeyaml-engine", version = "2.10" }
+snakeyaml-engine = { module = "org.snakeyaml:snakeyaml-engine", version = "3.0.1" }
 moshi = { module = "com.squareup.moshi:moshi", version = "1.15.2" }
 jdt-annotation = { module = "org.eclipse.jdt:org.eclipse.jdt.annotation", version = "2.4.100" }
 monarch-code = { module = "io.github.dingyi222666.monarch:monarch", version = "1.0.3" }