Merge pull request #18 from bluelhf/master

Newline fixes to compiler debug logs
Moderocky · Oct 14, 2023 · 90f6117 · 90f6117
2 parents 65ea545 + 1dce299
commit 90f6117
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/org/byteskript/skript/compiler/DebugSkriptCompiler.java b/src/main/java/org/byteskript/skript/compiler/DebugSkriptCompiler.java
@@ -41,15 +41,15 @@ protected void compileLine(String line, FileContext context) {
     public PostCompileClass[] compile(InputStream stream, Type path) {
         this.stream.print("\n");
         this.stream.print("--" + path.internalName());
-        this.stream.print("\n");
+        this.stream.print("\n\n");
         return super.compile(stream, path);
     }
 
     @Override
     public PostCompileClass[] compile(String source, Type path) {
-        this.stream.print("\n\n");
-        this.stream.print("--" + path.internalName());
         this.stream.print("\n");
+        this.stream.print("--" + path.internalName());
+        this.stream.print("\n\n");
         return super.compile(source, path);
     }
 
@@ -59,9 +59,8 @@ protected FileContext createContext(Type path) {
     }
 
     protected void debug(ElementTree tree, FileContext context) {
-        this.stream.print("\n");
         for (int i = 0; i < context.lineIndent; i++) this.stream.print("\t");
-        this.stream.print(tree.toString(context));
+        this.stream.println(tree.toString(context));
     }
 
 }
diff --git a/src/test/java/org/byteskript/skript/test/SyntaxTreeTest.java b/src/test/java/org/byteskript/skript/test/SyntaxTreeTest.java
@@ -47,7 +47,6 @@ function test (a, b):
             """, new Type("test"));
         assert stream.toString().equals("""
             
-            
             --test
             
             MemberDictionary():
@@ -68,7 +67,8 @@ function test (a, b):
               
             EventLoad():
             	EntryTriggerSection():
-            		EffectPrint(StringLiteral("Foo"))""") : '"' + stream.toString() + '"';
+            		EffectPrint(StringLiteral("Foo"))
+            """) : '"' + stream.toString() + '"';
     }
 
 }