Fixed: #2192 Long script lines are now wrapped (1000 chars limit by default) to avoid problems on Linux

This commit is contained in:
Jindra Petřík
2024-10-29 16:55:43 +01:00
parent a36e16fc73
commit db5aa019a6
19 changed files with 75 additions and 24 deletions
@@ -174,16 +174,16 @@ public abstract class AVM2Item extends GraphTargetItem {
if (((FullMultinameAVM2Item) propertyName).name != null) {
if (((FullMultinameAVM2Item) propertyName).namespace != null) {
//writer.append(".");
writer.hilightSpecial(".", HighlightSpecialType.PROPERTY_TYPE, 0, data);
writer.allowWrapHere().hilightSpecial(".", HighlightSpecialType.PROPERTY_TYPE, 0, data);
}
return propertyName.toString(writer, localData);
} else {
writer.hilightSpecial(".", HighlightSpecialType.PROPERTY_TYPE, 0, data);
writer.allowWrapHere().hilightSpecial(".", HighlightSpecialType.PROPERTY_TYPE, 0, data);
//writer.append(".");
return propertyName.toString(writer, localData);
}
} else {
writer.append("[");
writer.append("[").allowWrapHere();
propertyName.toString(writer, localData);
return writer.append("]");
}
@@ -236,7 +236,7 @@ public class CallAVM2Item extends AVM2Item {
writer.append("(");
for (int a = 0; a < arguments.size(); a++) {
if (a > 0) {
writer.append(",");
writer.allowWrapHere().append(",");
}
arguments.get(a).toString(writer, localData);
}
@@ -77,13 +77,13 @@ public class CallMethodAVM2Item extends AVM2Item {
} else {
receiver.toString(writer, localData);
}
writer.append(".");
writer.allowWrapHere().append(".");
writer.append(methodName);
writer.spaceBeforeCallParenthesies(arguments.size());
writer.append("(");
for (int a = 0; a < arguments.size(); a++) {
if (a > 0) {
writer.append(",");
writer.allowWrapHere().append(",");
}
arguments.get(a).toString(writer, localData);
}
@@ -101,8 +101,8 @@ public class CallPropertyAVM2Item extends AVM2Item {
writer.spaceBeforeCallParenthesies(arguments.size());
writer.append("(");
for (int a = 0; a < arguments.size(); a++) {
if (a > 0) {
writer.append(",");
if (a > 0) {
writer.allowWrapHere().append(",");
}
arguments.get(a).toString(writer, localData);
}
@@ -89,7 +89,7 @@ public class ConstructAVM2Item extends AVM2Item {
writer.append("(");
for (int a = 0; a < args.size(); a++) {
if (a > 0) {
writer.append(",");
writer.allowWrapHere().append(",");
}
args.get(a).toString(writer, localData);
}
@@ -91,7 +91,7 @@ public class ConstructPropAVM2Item extends AVM2Item {
writer.append("(");
for (int a = 0; a < args.size(); a++) {
if (a > 0) {
writer.append(",");
writer.allowWrapHere().append(",");
}
args.get(a).toString(writer, localData);
}
@@ -71,13 +71,13 @@ public class ConstructSuperAVM2Item extends AVM2Item {
public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if (!object.toString().equals("this")) {
object.toString(writer, localData);
writer.append(".");
writer.allowWrapHere().append(".");
}
writer.spaceBeforeCallParenthesies(args.size());
writer.append("super(");
for (int a = 0; a < args.size(); a++) {
if (a > 0) {
writer.append(",");
writer.allowWrapHere().append(",");
}
args.get(a).toString(writer, localData);
}
@@ -67,7 +67,7 @@ public class NewArrayAVM2Item extends AVM2Item {
writer.append("[");
for (int a = 0; a < values.size(); a++) {
if (a > 0) {
writer.append(",");
writer.allowWrapHere().append(",");
}
values.get(a).toString(writer, localData);
}