Adjust tests

Author: paxos

src/index.ts

@@ -614,44 +614,68 @@ function multilineStyle(textarea: HTMLTextAreaElement, arg: StyleArgs) {
   return {text, selectionStart, selectionEnd}
 }
 
-function undoOrderedListStyle(textarea: HTMLTextAreaElement): string[] {
-  const text = textarea.value.slice(textarea.selectionStart, textarea.selectionEnd)
+interface UndoResult {
+  text: string
+  processed: boolean
+}
+function undoOrderedListStyle(text: string): UndoResult {
   const lines = text.split('\n')
   const orderedListRegex = /^\d+\.\s+/
-  const result = lines
   const shouldUndoOrderedList = lines.every(line => orderedListRegex.test(line))
+  let result = lines
   if (shouldUndoOrderedList) {
-    return lines.map(line => line.replace(orderedListRegex, ''))
+    result = lines.map(line => line.replace(orderedListRegex, ''))
+  }
+
+  return {
+    text: result.join('\n'),
+    processed: shouldUndoOrderedList
   }
-  return result
 }
 
-function undoUnorderedListStyle(textarea: HTMLTextAreaElement): string[] {
-  const text = textarea.value.slice(textarea.selectionStart, textarea.selectionEnd)
+function undoUnorderedListStyle(text: string): UndoResult {
   const lines = text.split('\n')
   const unorderedListPrefix = '- '
   const shouldUndoUnorderedList = lines.every(line => line.startsWith(unorderedListPrefix))
-  const result = lines
+  let result = lines
   if (shouldUndoUnorderedList) {
-    return lines.map(line => line.slice(unorderedListPrefix.length, line.length))
+    result = lines.map(line => line.slice(unorderedListPrefix.length, line.length))
+  }
+
+  return {
+    text: result.join('\n'),
+    processed: shouldUndoUnorderedList
   }
-  return result
 }
 
 function listStyle(textarea: HTMLTextAreaElement, style: StyleArgs): SelectionRange {
   const noInitialSelection = textarea.selectionStart === textarea.selectionEnd
   let selectionStart = textarea.selectionStart
   let selectionEnd = textarea.selectionEnd
 
-  undoOrderedListStyle(textarea)
-  undoUnorderedListStyle(textarea)
+  // Select whole line
+  expandSelectionToLine(textarea)
 
   const prefix = '- '
 
-  // Select whole line
-  expandSelectionToLine(textarea)
+  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
+    }
+    return {text: undoUnorderedListResult.text, selectionStart, selectionEnd}
+  }
+
+  selectedText = undoUnorderedListResult.text
 
-  const selectedText = textarea.value.slice(textarea.selectionStart, textarea.selectionEnd)
   const lines = selectedText.split('\n').map((value, index) => {
     return `${prefix}${value}`
   })
@@ -667,7 +691,6 @@ function listStyle(textarea: HTMLTextAreaElement, style: StyleArgs): SelectionRa
   }
 
   const text = newlinesToAppend + lines.join('\n') + newlinesToPrepend
-
   return {text, selectionStart, selectionEnd}
 }
 

test/test.js

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