From a772460f63681b85fbc1ad9d972d329d871cbd7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sun, 20 Jun 2021 08:38:01 +0200
Subject: [PATCH] Simplifie surround with and make it more extensible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 .../views/rooms/BasicMessageComposer.tsx      | 45 +++++++------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index de72f8a348..239624f5d8 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -55,6 +55,14 @@ const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.sourc
 
 const IS_MAC = navigator.platform.indexOf("Mac") !== -1;
 
+const SURROUND_WITH_CHARACTERS = ["\"", "_", "`", "'", "*", "~", "$"];
+const SURROUND_WITH_DOUBLE_CHARACTERS = new Map([
+    ["(", ")"],
+    ["[", "]"],
+    ["{", "}"],
+    ["<", ">"],
+]);
+
 function ctrlShortcutLabel(key) {
     return (IS_MAC ? "⌘" : "Ctrl") + "+" + key;
 }
@@ -441,41 +449,18 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
         let handled = false;
 
         if (this.state.surroundWith && document.getSelection().type != "Caret") {
-            // Surround selected text with a character
-            if (event.key === '(') {
+            // This surrounds the selected text with a character. This is
+            // intentionally left out of the keybinding manager as the keybinds
+            // here shouldn't be changeable
+            if (SURROUND_WITH_CHARACTERS.includes(event.key)) {
                 this.historyManager.ensureLastChangesPushed(this.props.model);
                 this.modifiedFlag = true;
-                toggleInlineFormat(selectionRange, "(", ")");
+                toggleInlineFormat(selectionRange, event.key);
                 handled = true;
-            } else if (event.key === '[') {
+            } else if ([...SURROUND_WITH_DOUBLE_CHARACTERS.keys()].includes(event.key)) {
                 this.historyManager.ensureLastChangesPushed(this.props.model);
                 this.modifiedFlag = true;
-                toggleInlineFormat(selectionRange, "[", "]");
-                handled = true;
-            } else if (event.key === '{') {
-                this.historyManager.ensureLastChangesPushed(this.props.model);
-                this.modifiedFlag = true;
-                toggleInlineFormat(selectionRange, "{", "}");
-                handled = true;
-            } else if (event.key === '<') {
-                this.historyManager.ensureLastChangesPushed(this.props.model);
-                this.modifiedFlag = true;
-                toggleInlineFormat(selectionRange, "<", ">");
-                handled = true;
-            } else if (event.key === '"') {
-                this.historyManager.ensureLastChangesPushed(this.props.model);
-                this.modifiedFlag = true;
-                toggleInlineFormat(selectionRange, "\"");
-                handled = true;
-            } else if (event.key === '`') {
-                this.historyManager.ensureLastChangesPushed(this.props.model);
-                this.modifiedFlag = true;
-                toggleInlineFormat(selectionRange, "`");
-                handled = true;
-            } else if (event.key === '\'') {
-                this.historyManager.ensureLastChangesPushed(this.props.model);
-                this.modifiedFlag = true;
-                toggleInlineFormat(selectionRange, "'");
+                toggleInlineFormat(selectionRange, event.key, SURROUND_WITH_DOUBLE_CHARACTERS.get(event.key));
                 handled = true;
             }
         }