Fixed comment symbols not being escaped correctly

Author: adrianlee44

src/lib/util.coffee

@@ -17,6 +17,17 @@ util = {
     return str unless str
     str[0].toUpperCase() + str[1..]
 
+  #
+  # @function
+  # @name escape
+  # @description
+  # Escape special regular expression symbol
+  # @param {String} text Regular expression text
+  # @returns {String} Escaped text
+  #
+  escape: (text) ->
+    text.replace /[-[\]{}()*+?.,\\\/^$|#\s]/g, "\\$&"
+
   #
   # @function
   # @nam repeatChar
@@ -37,13 +48,14 @@ util = {
     # and move onto the next file
     return null unless lang?
 
-    regex = "^\\s*(?:#{lang.symbol}){1,2}#{commentRegexStr}"
+    symbol            = util.escape lang.symbol
+    regex             = "^\\s*(?:#{symbol}){1,2}#{commentRegexStr}"
     lang.commentRegex = new RegExp regex
-    lang.lineRegex    = new RegExp "^\\s*(?:#{lang.symbol}){1,2}\\s+(.*)"
-    lang.blockRegex   = new RegExp lang.block
+    lang.lineRegex    = new RegExp "^\\s*(?:#{symbol}){1,2}\\s+(.*)"
+    lang.blockRegex   = new RegExp util.escape(lang.block) if lang.block?
 
-    lang.startRegex = new RegExp lang.start if lang.start?
-    lang.endRegex   = new RegExp lang.end   if lang.end?
+    lang.startRegex = new RegExp util.escape(lang.start) if lang.start?
+    lang.endRegex   = new RegExp util.escape(lang.end)   if lang.end?
 
     return lang
 
@@ -92,4 +104,4 @@ util = {
 
 }
 
-module.exports = util
+module.exports = util

test/util_test.coffee

@@ -22,14 +22,29 @@ exports.utilTest =
       name:         'coffeescript'
       symbol:       '#'
       block:        '###'
-      lineRegex:    /^\s*(?:#){1,2}\s+(.*)/
-      commentRegex: /^\s*(?:#){1,2}\s*(?:@(\w+))?(?:\s*(.*))?/
-      blockRegex:   /###/
+      lineRegex:    /^\s*(?:\#){1,2}\s+(.*)/
+      commentRegex: /^\s*(?:\#){1,2}\s*(?:@(\w+))?(?:\s*(.*))?/
+      blockRegex:   /\#\#\#/
 
     test.deepEqual util.getLanguages("/test/test.coffee"), validSettings
 
     test.done()
 
+  "Get languages test for Javascript": (test) ->
+    validSettings =
+      name:         'javascript'
+      symbol:       '//'
+      start:        '/*'
+      end:          '*/'
+      lineRegex:    /^\s*(?:\/\/){1,2}\s+(.*)/
+      commentRegex: /^\s*(?:\/\/){1,2}\s*(?:@(\w+))?(?:\s*(.*))?/
+      startRegex:   /\/\*/
+      endRegex:     /\*\//
+
+    test.deepEqual util.getLanguages("/test/test.js"), validSettings
+
+    test.done()
+
   "Not supported language": (test) ->
     test.equal util.getLanguages("/test/test.fake"), null, "Should return null"
     test.done()
@@ -66,4 +81,4 @@ exports.utilTest =
       ### List
       **Chalk**  \nType: `Item`  \nWriting tool  \n\n
     """
-    test.done()
+    test.done()