Merge pull request #2765 from microsoft/u/juliaroldi/fix-markdown

Do not trigger markdown inside a word.
microsoft · Aug 12, 2024 · c5d5de9 · c5d5de9
2 parents 6370e59 + 2761b34
commit c5d5de9
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 4 deletions.
diff --git a/packages/roosterjs-content-model-plugins/lib/markdown/utils/setFormat.ts b/packages/roosterjs-content-model-plugins/lib/markdown/utils/setFormat.ts
@@ -21,19 +21,24 @@ export function setFormat(
         editor,
         (_model, previousSegment, paragraph, markerFormat, context) => {
             if (previousSegment.text[previousSegment.text.length - 1] == character) {
-                const textBeforeMarker = previousSegment.text.slice(0, -1);
+                const textSegment = previousSegment.text;
+                const textBeforeMarker = textSegment.slice(0, -1);
                 context.newPendingFormat = {
                     ...markerFormat,
                     strikethrough: !!markerFormat.strikethrough,
                     italic: !!markerFormat.italic,
                     fontWeight: markerFormat?.fontWeight ? 'bold' : undefined,
                 };
                 if (textBeforeMarker.indexOf(character) > -1) {
-                    const lastCharIndex = previousSegment.text.length;
-                    const firstCharIndex = previousSegment.text
+                    const lastCharIndex = textSegment.length;
+                    const firstCharIndex = textSegment
                         .substring(0, lastCharIndex - 1)
                         .lastIndexOf(character);
-                    if (lastCharIndex - firstCharIndex > 2) {
+
+                    if (
+                        hasSpaceBeforeFirstCharacter(textSegment, firstCharIndex) &&
+                        lastCharIndex - firstCharIndex > 2
+                    ) {
                         const formattedText = splitTextSegment(
                             previousSegment,
                             paragraph,
@@ -61,3 +66,12 @@ export function setFormat(
         }
     );
 }
+
+/**
+ * The markdown should not be trigger inside a word, then check if exist a space before the trigger character
+ * Should trigger markdown example: _one two_
+ * Should not trigger markdown example: one_two_
+ */
+function hasSpaceBeforeFirstCharacter(text: string, index: number) {
+    return !text[index - 1] || text[index - 1].trim().length == 0;
+}
diff --git a/packages/roosterjs-content-model-plugins/test/markdown/utils/setFormatTest.ts b/packages/roosterjs-content-model-plugins/test/markdown/utils/setFormatTest.ts
@@ -492,4 +492,31 @@ describe('setFormat', () => {
 
         runTest(input, '*', { fontWeight: 'bold' }, input, false);
     });
+
+    it('should not set italic - one_two_', () => {
+        const input: ContentModelDocument = {
+            blockGroupType: 'Document',
+            blocks: [
+                {
+                    blockType: 'Paragraph',
+                    segments: [
+                        {
+                            segmentType: 'Text',
+                            text: 'one_two_',
+                            format: {},
+                        },
+                        {
+                            segmentType: 'SelectionMarker',
+                            format: {},
+                            isSelected: true,
+                        },
+                    ],
+                    format: {},
+                },
+            ],
+            format: {},
+        };
+
+        runTest(input, '_', { italic: true }, input, false);
+    });
 });