backticks tests and untoggling update

matrix-org · Apr 2, 2022 · df033cc · df033cc
1 parent b743e8b
commit df033cc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/editor/deserialize.ts b/src/editor/deserialize.ts
@@ -33,7 +33,7 @@ function escape(text: string): string {
 // Finds the length of the longest backtick sequence in the given text, used for
 // escaping backticks in code blocks
 export function longestBacktickSequence(text: string): number {
-    let length = 0;
+    let length = 1;
     let currentLength = 0;
 
     for (const c of text) {

diff --git a/src/editor/operations.ts b/src/editor/operations.ts
@@ -208,15 +208,15 @@ 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, "`".repeat(longestBacktickSequence(range.text)));
+            toggleInlineFormat(range, "`".repeat(fenceLen));
             return;
         }
     }
-
     replaceRangeAndExpandSelection(range, parts);
 }
 

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" }]);
         });