Provide web client with better enclosing char matching

cowuake · Aug 19, 2024 · d7488b2 · d7488b2
1 parent 1f5e272
commit d7488b2
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/schemius-web/schemius.js b/schemius-web/schemius.js
@@ -241,11 +241,18 @@ class Schemius {
     return false;
   }
 
-  static matchChar(opening) {
-    const closing = Schemius.matchingChars[opening];
-    Schemius.terminal.cmd().insert(opening);
-    Schemius.terminal.cmd().insert(closing);
-    Schemius.dispatchKeyEvent("ArrowLeft");
+  static matchEnclosingChar(openingChar) {
+    const closingChar = Schemius.matchingChars[openingChar];
+    const position = Schemius.terminal.get_position();
+    const picker = Schemius.terminal.cmd().get();
+    const followingChar = picker[position];
+
+    Schemius.terminal.cmd().insert(openingChar);
+
+    if (!followingChar || followingChar !== openingChar) {
+      Schemius.terminal.cmd().insert(closingChar);
+      Schemius.dispatchKeyEvent("ArrowLeft");
+    }
   }
 
   static handleDelete() {
@@ -317,7 +324,7 @@ class Schemius {
         }
       }
     } else if (!Schemius.isMobile() && e.key in Schemius.matchingChars) {
-      Schemius.matchChar(e.key);
+      Schemius.matchEnclosingChar(e.key);
       return false;
     } else if (!Schemius.isMobile() && e.key === "BACKSPACE") {
       Schemius.handleDelete();