将Ignore的源码显示改为空块, 优化空块和内联块的显示

A4-Tacks · Dec 12, 2023 · 75b10f6 · 75b10f6
1 parent cdff044
commit 75b10f6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mindustry_logic_bang_lang"
-version = "0.13.3"
+version = "0.13.4"
 edition = "2021"
 
 authors = ["A4-Tacks <[email protected]>"]

diff --git a/src/syntax/mod.rs b/src/syntax/mod.rs
@@ -2271,23 +2271,27 @@ impl DisplaySource for LogicLine {
         match self {
             Self::Expand(expand) => {
                 meta.push("{");
-                meta.add_lf();
-                meta.do_block(|meta| {
-                    expand.display_source(meta);
-                });
+                if !expand.is_empty() {
+                    meta.add_lf();
+                    meta.do_block(|meta| {
+                        expand.display_source(meta);
+                    });
+                }
                 meta.push("}");
             },
             Self::InlineBlock(block) => {
                 meta.push("inline");
                 meta.add_space();
                 meta.push("{");
-                meta.add_lf();
-                meta.do_block(|meta| {
-                    block.display_source(meta);
-                });
+                if !block.is_empty() {
+                    meta.add_lf();
+                    meta.do_block(|meta| {
+                        block.display_source(meta);
+                    });
+                }
                 meta.push("}");
             },
-            Self::Ignore => meta.push("# ignore line"),
+            Self::Ignore => meta.push("{} # ignore line"),
             Self::NoOp => meta.push("noop;"),
             Self::Label(lab) => {
                 meta.push(":");