From 8719641ace1228a9b650c27b8a575cb3d3c4c761 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Wed, 27 Mar 2019 14:40:48 -0700 Subject: Added extra newline to output after a multiply-indented region ends. --- nomsu_decompiler.moon | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'nomsu_decompiler.moon') diff --git a/nomsu_decompiler.moon b/nomsu_decompiler.moon index e28c403..aff9433 100644 --- a/nomsu_decompiler.moon +++ b/nomsu_decompiler.moon @@ -393,7 +393,8 @@ tree_to_nomsu = (tree)-> -- or if the last line starts with ".." if tree[i-1].type != "Comment" 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 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 -- multi-line non-comments, or if a comment comes after a non-comment, -- 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!) - 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 item_nomsu prev_item = item_nomsu -- cgit v1.2.3