Add support for ordered list + tests

Author: paxos

src/index.ts

@@ -656,38 +656,49 @@ function listStyle(textarea: HTMLTextAreaElement, style: StyleArgs): SelectionRa
   // Select whole line
   expandSelectionToLine(textarea)
 
-  const prefix = '- '
+  const prefix = (index: number): string => {
+    if (style.unorderedList) {
+      return '- '
+    } else if (style.orderedList) {
+      return `${index + 1}. `
+    }
+    return ''
+  }
 
   let selectedText = textarea.value.slice(textarea.selectionStart, textarea.selectionEnd)
 
   const undoOrderedListResult = undoOrderedListStyle(selectedText)
   const undoUnorderedListResult = undoUnorderedListStyle(undoOrderedListResult.text)
 
   if (undoOrderedListResult.processed || undoUnorderedListResult.processed) {
-    if (noInitialSelection) {
-      selectionStart = Math.max(selectionStart - prefix.length, 0)
-      selectionEnd = selectionStart
-    } else {
-      selectionStart = Math.max(selectionStart - prefix.length, 0)
-      selectionEnd = selectionEnd + prefix.length // * lines.length
-    }
+    // if (noInitialSelection) {
+    //   selectionStart = Math.max(selectionStart - prefix.length, 0)
+    //   selectionEnd = selectionStart
+    // } else {
+    //   selectionStart = Math.max(selectionStart - prefix.length, 0)
+    //   selectionEnd = selectionEnd + prefix.length // * lines.length
+    // }
     return {text: undoUnorderedListResult.text, selectionStart, selectionEnd}
   }
 
   selectedText = undoUnorderedListResult.text
 
   const lines = selectedText.split('\n').map((value, index) => {
-    return `${prefix}${value}`
+    return `${prefix(index)}${value}`
   })
 
+  const totalPrefixLength = lines.reduce((previousValue, currentValue, currentIndex) => {
+    return previousValue + prefix(currentIndex).length
+  }, 0)
+
   const {newlinesToAppend, newlinesToPrepend} = newlinesToSurroundSelectedText(textarea)
 
   if (noInitialSelection) {
-    selectionStart = Math.max(selectionStart + prefix.length + newlinesToAppend.length, 0)
+    selectionStart = Math.max(selectionStart + prefix(0).length + newlinesToAppend.length, 0)
     selectionEnd = selectionStart
   } else {
-    selectionStart = Math.max(selectionStart + prefix.length + newlinesToAppend.length, 0)
-    selectionEnd = selectionEnd + newlinesToAppend.length + prefix.length * lines.length
+    selectionStart = Math.max(selectionStart + prefix(0).length + newlinesToAppend.length, 0)
+    selectionEnd = selectionEnd + newlinesToAppend.length + totalPrefixLength
   }
 
   const text = newlinesToAppend + lines.join('\n') + newlinesToPrepend

test/test.js

@@ -484,6 +484,50 @@ describe('markdown-toolbar-element', function () {
       })
     })
 
+    describe('ordered list', function () {
+      it('turns line into list if cursor at end of line', function () {
+        setVisualValue('One\nTwo|\nThree\n')
+        clickToolbar('md-ordered-list')
+        assert.equal('One\n\n1. Two|\n\nThree\n', visualValue())
+      })
+
+      it('turns line into list if cursor at end of document', function () {
+        setVisualValue('One\nTwo\nThree|')
+        clickToolbar('md-ordered-list')
+        assert.equal('One\nTwo\n\n1. Three|', visualValue())
+      })
+
+      it('turns line into list if cursor at beginning of line', function () {
+        setVisualValue('One\n|Two\nThree\n')
+        clickToolbar('md-ordered-list')
+        assert.equal('One\n\n1. |Two\n\nThree\n', visualValue())
+      })
+
+      it('turns line into list if cursor at middle of line', function () {
+        setVisualValue('One\nT|wo\nThree\n')
+        clickToolbar('md-ordered-list')
+        assert.equal('One\n\n1. T|wo\n\nThree\n', visualValue())
+      })
+
+      it('turns line into list if partial line is selected', function () {
+        setVisualValue('One\nT|w|o\nThree\n')
+        clickToolbar('md-ordered-list')
+        assert.equal('One\n\n1. T|w|o\n\nThree\n', visualValue())
+      })
+
+      it('turns two lines into list if two lines are selected', function () {
+        setVisualValue('|One\nTwo|\nThree\n')
+        clickToolbar('md-ordered-list')
+        assert.equal('1. |One\n2. Two|\n\nThree\n', visualValue())
+      })
+
+      it('turns two lines into list if 2 lines are partially selected', function () {
+        setVisualValue('O|ne\nTw|o\nThree\n')
+        clickToolbar('md-ordered-list')
+        assert.equal('1. O|ne\n2. Tw|o\n\nThree\n', visualValue())
+      })
+    })
+
     describe('unordered list', function () {
       it('turns line into list if cursor at end of line', function () {
         setVisualValue('One\nTwo|\nThree\n')