Account for blank newlines in citation blocks

Resolves #43
mdickin · Feb 3, 2019 · fe2fab5 · fe2fab5
1 parent 94b5283
commit fe2fab5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/lib/commands.js b/lib/commands.js
@@ -165,7 +165,7 @@ function toggleCheckboxes() {
 }
 
 var HasCitations = /^(\s*)> (.*)$/gmi
-var AddCitations = /^(\s*)(.+)$/gm
+var AddCitations = /^(\s*)(.*)$/gm
 function toggleCitations() {
 
     if (!editorHelpers.isAnythingSelected()) {
@@ -176,6 +176,7 @@ function toggleCitations() {
         return editorHelpers.replaceBlockSelection((text) => text.replace(HasCitations, "$1$2"))
     }
     else {
+        return editorHelpers.prefixLines("> ");
         return editorHelpers.replaceBlockSelection((text) => text.replace(AddCitations, "$1> $2"))
     }
 }

diff --git a/lib/editorHelpers.js b/lib/editorHelpers.js
@@ -8,7 +8,8 @@ module.exports = {
     surroundBlockSelection: surroundBlockSelection,
     getSurroundingWord: getSurroundingWord,
     isMatch: isMatch,
-    isBlockMatch: isBlockMatch
+    isBlockMatch: isBlockMatch,
+    prefixLines: prefixLines
 }
 
 function replaceSelection(replaceFunc) {
@@ -134,4 +135,15 @@ function isSelectionMatch(selection, startPattern, endPattern) {
     }
 
     return text.startsWith(startPattern) && text.endsWith(endPattern)
+}
+
+function prefixLines(text) {
+    var selection = vscode.window.activeTextEditor.selection;
+
+    return vscode.window.activeTextEditor.edit(builder => {
+            for (let line = selection.start.line; line <= selection.end.line; line++) {
+                builder.insert(selection.start.with(line, 0), text);
+            }
+        }
+    );
 }
diff --git a/test/extension.test.js b/test/extension.test.js
@@ -251,7 +251,14 @@ suite("Citations", function () {
         return TestCommand( 
             'toggleCitations', 
             'A li[st\nOf Citatio}ns', 
-            '> A [list\n> Of Cit}ations');
+            '> A li[st\n> Of Citatio}ns');
+    })
+
+    test("Ranged selection with blank lines", function () {
+        return TestCommand( 
+            'toggleCitations', 
+            'A li[st\n\n\nOf Citatio}ns', 
+            '> A li[st\n> \n> \n> Of Citatio}ns');
     })
 
     test("Toggles with collapsed selection", function () {