Merge pull request Rosemoe#610 from StarkZhidian/main

--bugfix=Fix the issue:Rosemoe#602
teixeira0x · Aug 22, 2024 · 4f3e36a · 4f3e36a
2 parents d37c1fd + b120662
commit 4f3e36a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
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
@@ -89,7 +89,7 @@ public void putPair(char[] charArray, SymbolPair symbolPair) {
         }
 
         list.add(symbolPair);
-        multipleCharByEndPairMaps.put(charArray[charArray.length - 1], list);
+        multipleCharByEndPairMaps.put(endChar, list);
     }
 
     /**

diff --git a/...textmate/src/main/java/io/github/rosemoe/sora/langs/textmate/TextMateSymbolPairMatch.java b/...textmate/src/main/java/io/github/rosemoe/sora/langs/textmate/TextMateSymbolPairMatch.java
@@ -95,19 +95,6 @@ public void updatePair() {
                 var newPair = new AutoClosingPairConditional(surroundingPair.open, surroundingPair.close,
                         surroundingPairFlagWithList);
 
-                var mergePairIndex = mergePairs.indexOf(newPair);
-
-                if (mergePairIndex >= 0) {
-                    var mergePair = mergePairs.get(mergePairIndex);
-
-                    if (mergePair.notIn == null || mergePair.notIn.isEmpty()) {
-                        mergePairs.add(newPair);
-                        continue;
-                    }
-
-                    mergePair.notIn.add(surroundingPairFlag);
-
-                }
                 mergePairs.add(newPair);
             }
         }