Mirrors
/
atom-beautify
mirror of https://github.com/Glavin001/atom-beautify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2068 from hxsf/master 

Fix #1790. Fix Lua indentation format bug
This commit is contained in:
Glavin Wiechert 2018-03-08 13:45:56 -04:00 committed by GitHub
parent b104361121 b97f106537
commit 5bb3667987
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/simple-jsbeautifyrc/lua/expected/test.lua
View File

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

8
src/beautifiers/lua-beautifier/beautifier.coffee
View File

@ -53,7 +53,7 @@ module.exports = (str, indent, warn_fn, opts = {}) ->
else else
return line return line
res1 = line.match(/\[(=*)\[/) res1 = line.match(/\[(=*)\[/)
if res1 if res1 and (not new RegExp("\\]#{'='.repeat res1[1].length}\\]").test line)
$template = res1[1].length + 1 $template = res1[1].length + 1
if !$template_flag if !$template_flag
line = line.trim() line = line.trim()
@ -62,9 +62,9 @@ module.exports = (str, indent, warn_fn, opts = {}) ->
if !line.length if !line.length
return '' return ''
raw_line = line raw_line = line
line = line.replace(/(['"])[^\1]*?\1/, '') line = line.replace(/(['"])[^\1]*?\1/g, '')
# remove all quoted fragments for proper bracket processing # 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 # 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) 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 $nextIndent = $currIndent + 1
@ -102,4 +102,4 @@ module.exports = (str, indent, warn_fn, opts = {}) ->
new_line or undefined new_line or undefined
warn_fn 'positive indentation at the end' if $currIndent > 0 warn_fn 'positive indentation at the end' if $currIndent > 0
new_code.join eol new_code.join eol