Skip to content

Commit e9eaa9b

Browse files
committed
fix: indenting and spaces in TextBuilder
1 parent 72688d7 commit e9eaa9b

File tree

3 files changed

+33
-5
lines changed

3 files changed

+33
-5
lines changed

src/main/java/dev/gothickit/mdd/decompiler/Decompiler.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,34 @@ public String[] formatSymbolInfo(@NotNull Decl decl) {
636636
orig.getLineStart(), orig.getLineCount(), orig.getCharStart(), orig.getCharCount()).split("\n");
637637
}
638638

639+
public String[] formatSymbolInfoText(@NotNull Decl decl) {
640+
var orig = decl.getSymbol();
641+
return String.format("Name: %s\n" +
642+
"Index: %d\n" +
643+
"Address: %d\n" +
644+
"Size: %d\n" +
645+
"Type: %s\n" +
646+
"Return Type: %s\n" +
647+
"Flags:\n" +
648+
" Const: %b\n" +
649+
" Member: %b\n" +
650+
" External: %b\n" +
651+
" Merged: %b\n" +
652+
" Generated: %b\n" +
653+
"Parent Index: %d\n" +
654+
"Member Offset: %d\n" +
655+
"Class Size: %d\n" +
656+
"\n" +
657+
"File Index: %d\n" +
658+
"Line Start: %d\n" +
659+
"Line Count: %d\n" +
660+
"Char Start: %d\n" +
661+
"Char Count: %d\n", orig.getName(), orig.getIndex(), orig.getAddress(), orig.getSize(), orig.getType(), orig.getReturnType(),
662+
orig.isConst(), orig.isMember(), orig.isExternal(), orig.isMerged(), orig.isGenerated(),
663+
orig.getParent(), orig.getOffsetAsMember(), orig.getClassSize(), orig.getFileIndex(),
664+
orig.getLineStart(), orig.getLineCount(), orig.getCharStart(), orig.getCharCount()).split("\n");
665+
}
666+
639667
public void setOptions(DecompilerOptions decompilerOptions) {
640668
this.options = decompilerOptions;
641669

src/main/java/dev/gothickit/mdd/gui/GuiMainView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void exportScriptFiles(final @NotNull File path) throws IOException {
100100

101101
try {
102102
decompiler.decompileCode(decl);
103-
builder.commentMultiline(decompiler.formatSymbolInfo(decl)).newline().syntax(decl).text(";").newline().newline();
103+
builder.commentMultiline(decompiler.formatSymbolInfoText(decl)).newline().syntax(decl).text(";").newline().newline();
104104
} catch (Exception e) {
105105
e.printStackTrace();
106106
}

src/main/java/dev/gothickit/mdd/output/TextBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ public SourceBuilder commentMultiline(String... comment) {
2828

2929
for (String s : comment) {
3030
newline();
31-
builder.append(" * ").append(s);
31+
builder.append(" * ").append(s);
3232
}
3333

3434
newline();
35-
builder.append(" */");
35+
builder.append(" */");
3636

3737
return this;
3838
}
@@ -93,13 +93,13 @@ public TextBuilder text(String text) {
9393

9494
@Override
9595
public TextBuilder newline() {
96-
this.builder.append(indent).append(System.lineSeparator());
96+
this.builder.append(System.lineSeparator()).append(indent);
9797
return this;
9898
}
9999

100100
@Override
101101
public TextBuilder space() {
102-
this.builder.append(" ");
102+
this.builder.append(" ");
103103
return this;
104104
}
105105

0 commit comments

Comments
 (0)