Merge pull request #611 from StarkZhidian/main

--bugfix=Fix SymbolPairMatch#matchBestPair return incorrect result
Rosemoe · Aug 26, 2024 · 1703c04 · 1703c04
2 parents 4f3e36a + 5606cdb
commit 1703c04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 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
@@ -1888,7 +1888,7 @@ public void commitText(CharSequence text, boolean applyAutoIndent) {
             }
 
             pair = languageSymbolPairs.matchBestPair(
-                    this.text, cursor.left(),
+                    this, cursor.left(),
                     inputText, firstCharFromText
             );
         }
@@ -1897,9 +1897,7 @@ public void commitText(CharSequence text, boolean applyAutoIndent) {
         var editorText = this.text;
         var quoteHandler = editorLanguage.getQuickQuoteHandler();
 
-        if (pair != null && pair != SymbolPairMatch.SymbolPair.EMPTY_SYMBOL_PAIR
-                && (pair.shouldReplace(this))
-        ) {
+        if (pair != null && pair != SymbolPairMatch.SymbolPair.EMPTY_SYMBOL_PAIR) {
 
             // QuickQuoteHandler can easily implement the feature of AutoSurround
             // and is at a higher level (customizable),

diff --git a/editor/src/main/java/io/github/rosemoe/sora/widget/SymbolPairMatch.java b/editor/src/main/java/io/github/rosemoe/sora/widget/SymbolPairMatch.java
@@ -125,7 +125,8 @@ public final List<SymbolPair> matchBestPairList(char editChar) {
     }
 
     @Nullable
-    public final SymbolPair matchBestPair(Content content, CharPosition cursorPosition, char[] inputCharArray, char firstChar) {
+    public final SymbolPair matchBestPair(CodeEditor editor, CharPosition cursorPosition, char[] inputCharArray, char firstChar) {
+        final Content content = editor.getText();
         // do not apply single character pairs for text with length > 1
         var singleCharPair = inputCharArray == null ? matchBestPairBySingleChar(firstChar) : null;
 
@@ -140,6 +141,9 @@ public final SymbolPair matchBestPair(Content content, CharPosition cursorPositi
 
         SymbolPair matchPair = null;
         for (var pair : matchList) {
+            if (!pair.shouldReplace(editor)) {
+                continue;
+            }
             var openCharArray = pair.open.toCharArray();
 
             // if flag is not 1, no match