Merge pull request #2068 from hxsf/master

Fix #1790. Fix Lua indentation format bug

examples/simple-jsbeautifyrc/lua/expected/test.lua

@@ -19,7 +19,7 @@ function aaa(a, b, c)
   -- comment 2     1231
   -- comment 1     123 123 123123 12
   -- [[ comment 1    ]]
-    --[[
+  --[[
         muli comments
             ssss
             @asdasd   sad

src/beautifiers/lua-beautifier/beautifier.coffee

@@ -53,7 +53,7 @@ module.exports = (str, indent, warn_fn, opts = {}) ->
       else
         return line
     res1 = line.match(/\[(=*)\[/)
-    if res1
+    if res1 and (not new RegExp("\\]#{'='.repeat res1[1].length}\\]").test line)
       $template = res1[1].length + 1
     if !$template_flag
       line = line.trim()
@@ -62,9 +62,9 @@ module.exports = (str, indent, warn_fn, opts = {}) ->
     if !line.length
       return ''
     raw_line = line
-    line = line.replace(/(['"])[^\1]*?\1/, '')
+    line = line.replace(/(['"])[^\1]*?\1/g, '')
     # remove all quoted fragments for proper bracket processing
-    line = line.replace(/\s*--.+/, '')
+    line = line.replace(/\s*--.+$/, '')
     # remove all comments; this ignores long bracket style comments
     if /^((local )?function|repeat|while)\b/.test(line) and !/\bend\s*[\),;]*$/.test(line) or /\b(then|do)$/.test(line) and !/^elseif\b/.test(line) or /^if\b/.test(line) and /\bthen\b/.test(line) and !/\bend$/.test(line) or /\bfunction ?(?:\w+ )?\([^\)]*\)$/.test(line) and !/\bend$/.test(line)
       $nextIndent = $currIndent + 1
@@ -102,4 +102,4 @@ module.exports = (str, indent, warn_fn, opts = {}) ->
     new_line or undefined
 
   warn_fn 'positive indentation at the end' if $currIndent > 0
-  new_code.join eol
+  new_code.join eol