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

Added the ": for $ in $: ..." shorthand for indented comprehensions.

Browse Source
This commit is contained in:
Bruce Hill 2018-12-31 01:36:48 -08:00
parent d8f9b15fd9
commit 7762c8c45b
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nomsu_decompiler.lua
View File

@ -562,6 +562,12 @@ tree_to_nomsu = function(tree)
if i > 1 then
sep = '\n'
end
elseif item.type == 'Block' and #item == 1 then
item_nomsu = tree_to_nomsu(item[1])
item_nomsu:prepend(": ")
if i > 1 then
sep = '\n'
end
else
item_nomsu = tree_to_inline_nomsu(item)
if #item_nomsu:text() > MAX_LINE then
@ -573,7 +579,7 @@ tree_to_nomsu = function(tree)
end
nomsu:add(sep)
nomsu:add(item_nomsu)
if item_nomsu:is_multiline() or item.type == 'Comment' or nomsu:trailing_line_len() + #tostring(item_nomsu) >= MAX_LINE then
if item_nomsu:is_multiline() or item.type == 'Comment' or item.type == "Block" or nomsu:trailing_line_len() + #tostring(item_nomsu) >= MAX_LINE then
sep = '\n'
else
sep = ', '

8
nomsu_decompiler.moon
View File

@ -427,6 +427,11 @@ tree_to_nomsu = (tree)->
elseif item.type == 'Comment'
item_nomsu = tree_to_nomsu(item)
sep = '\n' if i > 1
elseif item.type == 'Block' and #item == 1
-- Comprehensions use the more concise ": for $ in $: ..." form
item_nomsu = tree_to_nomsu(item[1])
item_nomsu\prepend ": "
sep = '\n' if i > 1
else
item_nomsu = tree_to_inline_nomsu(item)
if #item_nomsu\text! > MAX_LINE
@ -434,7 +439,8 @@ tree_to_nomsu = (tree)->
item_nomsu = tree_to_nomsu(item)
nomsu\add sep
nomsu\add item_nomsu
if item_nomsu\is_multiline! or item.type == 'Comment' or nomsu\trailing_line_len! + #tostring(item_nomsu) >= MAX_LINE
if item_nomsu\is_multiline! or item.type == 'Comment' or item.type == "Block" or
nomsu\trailing_line_len! + #tostring(item_nomsu) >= MAX_LINE
sep = '\n'
else
sep = ', '