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

method names with invalid chars

Browse Source
This commit is contained in:
lgrignon 2017-02-08 19:23:53 +01:00
parent aa4b3e1798
commit fc85e93a88
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
transpiler/pom.xml
View File

@ -127,6 +127,7 @@
<javadocVersion>1.8</javadocVersion>
<sourcepath>src/main/java</sourcepath>
<encoding>${project.build.sourceEncoding}</encoding>
<skip>${skipJavadoc}</skip>
<fixTags>all</fixTags>
<failOnError>false</failOnError>
<reportOutputDirectory>/var/www/apidocs/org/jsweet</reportOutputDirectory>

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

@ -1552,7 +1552,12 @@ public class Java2TypeScriptTranslator<C extends JSweetContext> extends Abstract
if (inOverload && !overload.isValid && !inCoreWrongOverload) {
print(getOverloadMethodName(methodDecl.sym));
} else {
print(getTSMethodName(methodDecl));
String tsMethodName = getTSMethodName(methodDecl);
if (doesMemberNameRequireQuotes(tsMethodName)) {
print("'" + tsMethodName + "'");
} else {
print(tsMethodName);
}
}
}
if ((methodDecl.typarams != null && !methodDecl.typarams.isEmpty())
@ -1695,8 +1700,15 @@ public class Java2TypeScriptTranslator<C extends JSweetContext> extends Abstract
if (parent.sym != method.sym.getEnclosingElement()
&& context.getOverload((ClassSymbol) method.sym.getEnclosingElement(),
method.sym).coreMethod == method) {
print("{").println().startIndent().printIndent()
.print("super." + getTSMethodName(methodDecl) + "(");
print("{").println().startIndent().printIndent();
String tsMethodName = getTSMethodName(methodDecl);
if (doesMemberNameRequireQuotes(tsMethodName)) {
print("super['" + tsMethodName + "']");
} else {
print("super." + tsMethodName + "");
}
print("(");
for (int j = 0; j < method.getParameters().size(); j++) {
print(avoidJSKeyword(overload.coreMethod.getParameters().get(j).name.toString()))
.print(", ");
@ -1770,13 +1782,13 @@ public class Java2TypeScriptTranslator<C extends JSweetContext> extends Abstract
name = getAdapter().getIdentifier(var.sym);
}
if (getScope().innerClassNotStatic && !Util.isConstantOrNullField(var)) {
if (doesFieldNameRequireQuotes(name)) {
if (doesMemberNameRequireQuotes(name)) {
printIndent().print("this['").print(name).print("'] = ").print(var.init).print(";").println();
} else {
printIndent().print("this.").print(name).print(" = ").print(var.init).print(";").println();
}
} else if (var.init == null) {
if (doesFieldNameRequireQuotes(name)) {
if (doesMemberNameRequireQuotes(name)) {
printIndent().print("this['").print(name).print("'] = ").print(Util.getTypeInitialValue(var.type))
.print(";").println();
} else {
@ -2179,7 +2191,7 @@ public class Java2TypeScriptTranslator<C extends JSweetContext> extends Abstract
print("...");
}
if (doesFieldNameRequireQuotes(name)) {
if (doesMemberNameRequireQuotes(name)) {
print("'" + name + "'");
} else {
print(name);
@ -2280,7 +2292,7 @@ public class Java2TypeScriptTranslator<C extends JSweetContext> extends Abstract
}
}
private boolean doesFieldNameRequireQuotes(String name) {
private boolean doesMemberNameRequireQuotes(String name) {
for (char c : name.toCharArray()) {
if (TS_IDENTIFIER_FORBIDDEN_CHARS.contains(c)) {
return true;
@ -2399,7 +2411,7 @@ public class Java2TypeScriptTranslator<C extends JSweetContext> extends Abstract
} else {
fieldName = getAdapter().getIdentifier(fieldAccess.sym);
}
if (doesFieldNameRequireQuotes(fieldName)) {
if (doesMemberNameRequireQuotes(fieldName)) {
if (getLastPrintedChar() == '.') {
removeLastChar();
print("['").print(fieldName).print("']");
@ -2886,7 +2898,7 @@ public class Java2TypeScriptTranslator<C extends JSweetContext> extends Abstract
print(name);
}
} else {
if (doesFieldNameRequireQuotes(name)) {
if (doesMemberNameRequireQuotes(name)) {
if (getLastPrintedChar() == '.') {
removeLastChar();
print("['").print(name).print("']");

4
transpiler/src/test/java/source/structural/Name.java
View File

@ -28,6 +28,10 @@ public class Name {
static Array<String> array;
@jsweet.lang.Name("method-name-with-dash")
void method_name_with_dash() {}
public static void main(String[] args) {
array.reduceCallbackfnFunction4((s1, s2, d, s3) -> {
return null;