Match whitespace, including non-breaking spaces, test properly

Author: mtodd

app/assets/javascripts/task_lists.coffee

@@ -99,12 +99,21 @@
 # To automatically enable TaskLists, add the `js-task-list-enable` class to the
 # `js-task-list-container`.
 
-incomplete     = "[ ]"
-incompleteNBSP = "[\xC2\xA0]"
-complete       = "[x]"
+incomplete = "[ ]"
+complete   = "[x]"
 
-escape = (str) ->
-  str.replace(/([\[\]])/g, "\\$1")
+# Escapes the String for regular expression matching.
+escapePattern = (str) ->
+  str.
+    replace(/([\[\]])/g, "\\$1"). # escape square brackets
+    replace(/\s/, "\\s")          # match all white space
+
+incompletePattern = ///
+  #{escapePattern(incomplete)}
+///
+completePattern = ///
+  #{escapePattern(complete)}
+///
 
 # Pattern used to identify all task list items.
 # Useful when you need iterate over all items.
@@ -113,9 +122,8 @@ itemPattern = ///
   (?:\s*[-+*]|(?:\d+\.))? # optional list prefix
   \s*                     # optional whitespace prefix
   (                       # checkbox
-    #{escape(complete)}|
-    #{escape(incomplete)}|
-    #{escape(incompleteNBSP)}
+    #{escapePattern(complete)}|
+    #{escapePattern(incomplete)}
   )
   (?=\s)                  # followed by whitespace
 ///
@@ -137,9 +145,8 @@ codeFencesPattern = ///
 itemsInParasPattern = ///
   ^
   (
-    #{escape(complete)}|
-    #{escape(incomplete)}|
-    #{escape(incompleteNBSP)}
+    #{escapePattern(complete)}|
+    #{escapePattern(incomplete)}
   )
   .+
   $
@@ -159,9 +166,9 @@ updateTaskListItem = (source, itemIndex, checked) ->
       if index == itemIndex
         line =
           if checked
-            line.replace(incomplete, complete).replace(incompleteNBSP, complete)
+            line.replace(incompletePattern, complete)
           else
-            line.replace(complete, incomplete)
+            line.replace(completePattern, incomplete)
     line
   result.join("\n")
 

test/unit/test_updates.coffee

@@ -20,6 +20,8 @@ module "TaskList updates",
       disabled: true
       checked: false
 
+    # non-breaking space. See: https://github.com/github/task-lists/pull/14
+    @nbsp = String.fromCharCode(160)
     @incompleteNBSPItem = $ '<li>', class: 'task-list-item'
     @incompleteNBSPCheckbox = $ '<input>',
       type: 'checkbox'
@@ -30,19 +32,19 @@ module "TaskList updates",
     @field = $ '<textarea>', class: 'js-task-list-field', text: """
       - [x] complete
       - [ ] incomplete
-      - [\xC2\xA0] incompleteNBSP
+      - [#{@nbsp}] incompleteNBSP
     """
 
     @changes =
       toComplete: """
       - [ ] complete
       - [ ] incomplete
-      - [\xC2\xA0] incompleteNBSP
+      - [#{@nbsp}] incompleteNBSP
       """
       toIncomplete: """
       - [x] complete
       - [x] incomplete
-      - [\xC2\xA0] incompleteNBSP
+      - [#{@nbsp}] incompleteNBSP
       """
       toIncompleteNBSP: """
       - [x] complete
@@ -99,6 +101,7 @@ asyncTest "updates the source, marking the complete item as incomplete", ->
 
   @completeCheckbox.click()
 
+# See: https://github.com/github/task-lists/pull/14
 asyncTest "updates the source for items with non-breaking spaces", ->
   expect 3