backticks tests and untoggling update

matrix-org · Apr 2, 2022 · 04e00ef · 04e00ef
1 parent 2e1533c
commit 04e00ef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/editor/operations.ts b/src/editor/operations.ts
@@ -182,7 +182,8 @@ export function formatRangeAsCode(range: Range): void {
 
     const hasBlockFormatting = (range.length > 0)
         && range.text.startsWith("```")
-        && range.text.endsWith("```");
+        && range.text.endsWith("```")
+        && range.text.includes('\n');
     const hasBacktick = (range.text.includes("`"))
         && !range.text.startsWith("`")
         && !range.text.endsWith("`");
@@ -208,11 +209,16 @@ export function formatRangeAsCode(range: Range): void {
             parts.push(partCreator.newline());
         }
     } else {
+        const fenceLen = longestBacktickSequence(range.text);
         if (hasBacktick) {
-            parts.unshift(partCreator.plain("`".repeat(longestBacktickSequence(range.text)+ 1)));
-            parts.push(partCreator.plain("`".repeat(longestBacktickSequence(range.text)+ 1)));
+            parts.unshift(partCreator.plain("`".repeat(fenceLen + 1)));
+            parts.push(partCreator.plain("`".repeat(fenceLen+ 1)));
         } else {
-            toggleInlineFormat(range, "`");
+            if (fenceLen === 0) {
+                toggleInlineFormat(range, "`");
+                return;
+            }
+            toggleInlineFormat(range, "`".repeat(fenceLen));
             return;
         }
     }

diff --git a/test/editor/operations-test.js b/test/editor/operations-test.js
@@ -21,6 +21,7 @@ import {
     toggleInlineFormat,
     selectRangeOfWordAtCaret,
     formatRange,
+    formatRangeAsCode,
 } from "../../src/editor/operations";
 import { Formatting } from "../../src/components/views/rooms/MessageComposerFormatBar";
 import { longestBacktickSequence } from '../../src/editor/deserialize';
@@ -58,7 +59,7 @@ describe('editor/operations: formatting operations', () => {
             expect(range.parts[0].text.trim().includes("`")).toBeTruthy();
             expect(longestBacktickSequence(range.parts[0].text.trim())).toBe(1);
             expect(model.serializeParts()).toEqual([{ "text": "hello ` world!", "type": "plain" }]);
-            toggleInlineFormat(range, "`".repeat(longestBacktickSequence(range.parts[0].text.trim()) + 1));
+            formatRangeAsCode(range);
             expect(model.serializeParts()).toEqual([{ "text": "``hello ` world``!", "type": "plain" }]);
         });