Make the lenght calculations better

Author: andrerpena

src/commands/codeCommand.tsx

@@ -14,11 +14,15 @@ export const codeCommand: Command = {
 
         // when there's no breaking line
         if (state1.selectedText.indexOf("\n") === -1) {
-            const state2 = api.replaceSelection(`\`${state1.selectedText}\``);
+            api.replaceSelection(`\`${state1.selectedText}\``);
             // Adjust the selection to not contain the **
+
+            const selectionStart = state1.selection.start + 1;
+            const selectionEnd = selectionStart + state1.selectedText.length;
+
             api.setSelectionRange({
-                start: state2.selection.end - 1 - state1.selectedText.length,
-                end: state2.selection.end - 1
+                start: selectionStart,
+                end: selectionEnd
             });
             return;
         }
@@ -29,11 +33,14 @@ export const codeCommand: Command = {
         const breaksAfterCount = getBreaksNeededForEmptyLineAfter(state1.text, state1.selection.end);
         const breaksAfter = Array(breaksAfterCount + 1).join("\n");
 
-        const state2 = api.replaceSelection(`${breaksBefore}\`\`\`\n${state1.selectedText}\n\`\`\`${breaksAfter}`);
-        // Adjust the selection to not contain the **
+        api.replaceSelection(`${breaksBefore}\`\`\`\n${state1.selectedText}\n\`\`\`${breaksAfter}`);
+
+        const selectionStart = state1.selection.start + breaksBeforeCount + 4;
+        const selectionEnd = selectionStart + state1.selectedText.length;
+
         api.setSelectionRange({
-            start: state2.selection.end - 1 - state1.selectedText.length - breaksAfterCount - 3,
-            end: state2.selection.end - 1 - breaksAfterCount - 3
+            start: selectionStart,
+            end: selectionEnd
         });
     }
     ,

src/commands/listCommands.tsx

@@ -43,22 +43,18 @@ export const unorderedListCommand: Command = {
         const breaksAfterCount = getBreaksNeededForEmptyLineAfter(state1.text, state1.selection.end);
         const breaksAfter = Array(breaksAfterCount + 1).join("\n");
 
-        const state2 = api.replaceSelection(`${breaksBefore}${state1.selectedText}${breaksAfter}`);
+        const modifiedText = insertBeforeEachLine(state1.selectedText, "- ");
 
-        // const modifiedText = insertBeforeEachLine(state2.selectedText, "- ");
-        // const state3 = api.replaceSelection(modifiedText.modifiedText);
+        api.replaceSelection(`${breaksBefore}${modifiedText.modifiedText}${breaksAfter}`);
 
-        const modifiedText = { insertionLength: 0 };
-        const state3 = state2;
-
-        const selectionRange = {
-            start: state3.selection.end - state1.selectedText.length - breaksAfterCount,
-            end: state3.selection.end - breaksAfterCount
-        };
+        const selectionStart = state1.selection.start + breaksBeforeCount;
+        const selectionEnd = selectionStart + modifiedText.modifiedText.length;
 
         // Adjust the selection to not contain the **
-        api.setSelectionRange(selectionRange);
-    }
-    ,
+        api.setSelectionRange({
+            start: selectionStart,
+            end: selectionEnd
+        });
+    },
     keyCommand: "code",
 }

src/commands/quoteCommand.tsx

@@ -19,11 +19,15 @@ export const quoteCommand: Command = {
         const breaksAfter = Array(breaksAfterCount + 1).join("\n");
 
         // Replaces the current selection with the bold mark up
-        const state2 = api.replaceSelection( `${breaksBefore}> ${state1.selectedText}${breaksAfter}`);
+        api.replaceSelection( `${breaksBefore}> ${state1.selectedText}${breaksAfter}`);
         // Adjust the selection to not contain the **
+
+        const selectionStart = state1.selection.start + breaksBeforeCount + 2;
+        const selectionEnd = selectionStart + state1.selectedText.length;
+
         api.setSelectionRange({
-            start: state2.selection.end - state1.selectedText.length - breaksAfterCount,
-            end: state2.selection.end - breaksAfterCount
+            start: selectionStart,
+            end: selectionEnd
         });
     },
     keyCommand: "quote",