archive-gh-me/jsweet
1
0
Fork 0
mirror of https://github.com/cincheo/jsweet.git synced 2025-12-15 15:29:22 +00:00
Code Issues Projects Releases Wiki Activity

pretty printing improvements

Browse Source
This commit is contained in:
Renaud Pawlak 2015-12-30 15:35:11 +01:00
parent 7a9e00a628
commit e4139b27f2
1 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/main/java/org/jsweet/transpiler/typescript/Java2TypeScriptTranslator.java
View File

@ -517,6 +517,13 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter {
print(" {").println().startIndent(); print(" {").println().startIndent();
} }
if (enumScope) {
printIndent();
}
if (globals) {
removeLastIndent();
}
for (JCTree def : classdecl.defs) { for (JCTree def : classdecl.defs) {
if (def instanceof JCVariableDecl) { if (def instanceof JCVariableDecl) {
if (enumScope && ((JCVariableDecl) def).type.tsym != classdecl.type.tsym) { if (enumScope && ((JCVariableDecl) def).type.tsym != classdecl.type.tsym) {
@ -527,28 +534,35 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter {
continue; continue;
} }
} }
printIndent(); if (!enumScope) {
printIndent();
}
int pos = getCurrentPosition(); int pos = getCurrentPosition();
print(def); print(def);
if (getCurrentPosition() == pos) { if (getCurrentPosition() == pos) {
removeLastIndent(); if (!enumScope) {
removeLastIndent();
}
continue; continue;
} }
if (def instanceof JCVariableDecl) { if (def instanceof JCVariableDecl) {
if (enumScope) { if (enumScope) {
print(","); print(", ");
} else { } else {
print(";"); print(";").println().println();
println();
println();
} }
} else { } else {
println(); println().println();
println();
} }
} }
removeLastChar();
if (enumScope) {
removeLastChar().println();
}
if (!globals) { if (!globals) {
removeLastChar().endIndent().printIndent().print("}"); endIndent().printIndent().print("}");
} }
if (mainMethod != null && mainMethod.getParameters().size() < 2) { if (mainMethod != null && mainMethod.getParameters().size() < 2) {
@ -1392,13 +1406,20 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter {
@Override @Override
public void visitForeachLoop(JCEnhancedForLoop foreachLoop) { public void visitForeachLoop(JCEnhancedForLoop foreachLoop) {
String itVarName = "__it_" + Util.getId(); String indexVarName = "index" + Util.getId();
String exprVarName = "__expr_" + Util.getId(); if (foreachLoop.expr instanceof JCIdent || foreachLoop.expr instanceof JCFieldAccess) {
print("var " + exprVarName + " = ").print(foreachLoop.expr).print("; "); print("for(var " + indexVarName + "=0; " + indexVarName + " < ").print(foreachLoop.expr).print(".length; " + indexVarName + "++) {").println()
print("for(var " + itVarName + "=0;" + itVarName + "<" + exprVarName + ".length;" + itVarName + "++) { ") .startIndent().printIndent();
.print("var " + foreachLoop.var.name.toString() + "=" + exprVarName + "[" + itVarName + "];").println(); print("var " + foreachLoop.var.name.toString() + " = ").print(foreachLoop.expr).print("[" + indexVarName + "];").println();
startIndent().printIndent().print(foreachLoop.body); } else {
endIndent().print("}"); String arrayVarName = "array" + Util.getId();
print("var " + arrayVarName + " = ").print(foreachLoop.expr).print(";").println().printIndent();
print("for(var " + indexVarName + "=0; " + indexVarName + " < " + arrayVarName + ".length; " + indexVarName + "++) {").println().startIndent()
.printIndent();
print("var " + foreachLoop.var.name.toString() + " = " + arrayVarName + "[" + indexVarName + "];").println();
}
printIndent().print(foreachLoop.body);
endIndent().println().printIndent().print("}");
} }
@Override @Override
@ -1652,7 +1673,7 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter {
print(var.name.toString()).print(","); print(var.name.toString()).print(",");
} }
removeLastChar(); removeLastChar();
print(") => { return "); print(") => {").println().startIndent().printIndent().print("return ");
} }
this.skipTypeAnnotations = true; this.skipTypeAnnotations = true;
print("(").printArgList(lamba.params).print(") => "); print("(").printArgList(lamba.params).print(") => ");
@ -1660,7 +1681,7 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter {
print(lamba.body); print(lamba.body);
if (!finalVars.isEmpty()) { if (!finalVars.isEmpty()) {
print("})("); endIndent().println().printIndent().print("})(");
for (VarSymbol var : finalVars) { for (VarSymbol var : finalVars) {
print(var.name.toString()).print(","); print(var.name.toString()).print(",");
} }