fix(editor): symbol completion is conflict with search replace (fix #638

)
Rosemoe · Jan 30, 2025 · d7d4003 · d7d4003
1 parent 447750f
commit d7d4003
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/editor/src/main/java/io/github/rosemoe/sora/widget/CodeEditor.java b/editor/src/main/java/io/github/rosemoe/sora/widget/CodeEditor.java
@@ -1874,16 +1874,28 @@ public void commitText(CharSequence text) {
     /**
      * Commit text at current state from IME
      *
-     * @param text Text commit by InputConnection
+     * @param text            Text commit by InputConnection
+     * @param applyAutoIndent Apply automatic indentation
      */
     public void commitText(CharSequence text, boolean applyAutoIndent) {
+        commitText(text, true, true);
+    }
+
+    /**
+     * Commit text with given options
+     *
+     * @param text Text commit by InputConnection
+     * @param applyAutoIndent Apply automatic indentation
+     * @param applySymbolCompletion Apply symbol surroundings and completions
+     */
+    public void commitText(CharSequence text, boolean applyAutoIndent, boolean applySymbolCompletion) {
         if (text.length() == 0) {
             return;
         }
 
         // replace text
         SymbolPairMatch.SymbolPair pair = null;
-        if (getProps().symbolPairAutoCompletion && text.length() > 0) {
+        if (applySymbolCompletion && getProps().symbolPairAutoCompletion && text.length() > 0) {
             var endCharFromText = text.charAt(text.length() - 1);
 
             char[] inputText = null;

diff --git a/editor/src/main/java/io/github/rosemoe/sora/widget/EditorSearcher.java b/editor/src/main/java/io/github/rosemoe/sora/widget/EditorSearcher.java
@@ -299,7 +299,7 @@ public void replaceCurrentMatch(@NonNull String replacement) {
             if (replacement.isEmpty()) {
                 editor.deleteText();
             } else {
-                editor.commitText(replacement);
+                editor.commitText(replacement, false, false);
             }
         } else {
             gotoNext();