Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added extra newline to output after a multiply-indented region ends.

Browse Source
This commit is contained in:
Bruce Hill 2019-03-27 14:40:48 -07:00
parent f4dd9664bf
commit 8719641ace
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nomsu_decompiler.lua
View File

@ -515,7 +515,7 @@ tree_to_nomsu = function(tree)
nomsu:add("\n") nomsu:add("\n")
if tree[i - 1].type ~= "Comment" then if tree[i - 1].type ~= "Comment" then
needs_space[i] = (line_nomsu:is_multiline() and prev_line:is_multiline()) needs_space[i] = (line_nomsu:is_multiline() and prev_line:is_multiline())
if tree[i].type == "Comment" or needs_space[i] or needs_space[i - 1] then if (tree[i].type == "Comment" or needs_space[i] or needs_space[i - 1] or prev_line:text():match("\n [^\n]*$")) then
nomsu:add("\n") nomsu:add("\n")
end end
end end
@ -654,9 +654,9 @@ tree_to_nomsu = function(tree)
end end
nomsu:add(sep) nomsu:add(sep)
if sep == '\n' then if sep == '\n' then
if tree[i - 1].type ~= "Comment" then if i > 1 and tree[i - 1].type ~= "Comment" then
needs_space[i] = (item_nomsu:is_multiline() and prev_item:is_multiline()) needs_space[i] = (item_nomsu:is_multiline() and prev_item:is_multiline())
if tree[i].type == "Comment" or needs_space[i] or needs_space[i - 1] then if (tree[i].type == "Comment" or needs_space[i] or needs_space[i - 1] or prev_item:text():match("\n [^\n]*$")) then
nomsu:add("\n") nomsu:add("\n")
end end
end end

8
nomsu_decompiler.moon
View File

@ -393,7 +393,8 @@ tree_to_nomsu = (tree)->
-- or if the last line starts with ".." -- or if the last line starts with ".."
if tree[i-1].type != "Comment" if tree[i-1].type != "Comment"
needs_space[i] = (line_nomsu\is_multiline! and prev_line\is_multiline!) needs_space[i] = (line_nomsu\is_multiline! and prev_line\is_multiline!)
if tree[i].type == "Comment" or needs_space[i] or needs_space[i-1] if (tree[i].type == "Comment" or needs_space[i] or needs_space[i-1] or
prev_line\text!\match("\n [^\n]*$"))
nomsu\add "\n" nomsu\add "\n"
nomsu\add line_nomsu nomsu\add line_nomsu
prev_line = line_nomsu prev_line = line_nomsu
@ -503,9 +504,10 @@ tree_to_nomsu = (tree)->
-- Rule of thumb: add a blank line between two lines if both are -- Rule of thumb: add a blank line between two lines if both are
-- multi-line non-comments, or if a comment comes after a non-comment, -- multi-line non-comments, or if a comment comes after a non-comment,
-- or if the last line starts with ".." -- or if the last line starts with ".."
if tree[i-1].type != "Comment" if i > 1 and tree[i-1].type != "Comment"
needs_space[i] = (item_nomsu\is_multiline! and prev_item\is_multiline!) needs_space[i] = (item_nomsu\is_multiline! and prev_item\is_multiline!)
if tree[i].type == "Comment" or needs_space[i] or needs_space[i-1] if (tree[i].type == "Comment" or needs_space[i] or needs_space[i-1] or
prev_item\text!\match("\n [^\n]*$"))
nomsu\add "\n" nomsu\add "\n"
nomsu\add item_nomsu nomsu\add item_nomsu
prev_item = item_nomsu prev_item = item_nomsu