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

fix for static imports with @Root annotation + associated test cases

Browse Source
This commit is contained in:
Renaud Pawlak 2015-11-23 19:45:44 +01:00
parent bfd3d32276
commit fbc32b0f6f
5 changed files with 91 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/jsweet/transpiler/typescript/Java2TypeScriptAdapter.java
View File

@ -136,12 +136,13 @@ public class Java2TypeScriptAdapter extends AbstractPrinterAdapter {
}
// function belong to the current package (no need to
// import)
String current = Util.getRootRelativeJavaName(getPrinter().getCompilationUnit().packge);
if (getPrinter().getContext().useModules) {
if (getPrinter().getCompilationUnit().packge.getQualifiedName().toString().equals(name)) {
if (current.equals(name)) {
return null;
}
} else {
if (getPrinter().getCompilationUnit().packge.getQualifiedName().toString().startsWith(name)) {
if (current.startsWith(name)) {
return null;
}
}

20
src/test/java/org/jsweet/test/transpiler/StructuralTests.java
View File

@ -44,6 +44,8 @@ import org.jsweet.test.transpiler.source.structural.globalclasses.c.GlobalFuncti
import org.jsweet.test.transpiler.source.structural.globalclasses.d.GlobalFunctionAccessFromMain;
import org.jsweet.test.transpiler.source.structural.globalclasses.f.GlobalFunctionStaticDelete;
import org.jsweet.test.transpiler.source.structural.globalclasses.g.GlobalFunctionDelete;
import org.jsweet.test.transpiler.source.structural.globalclasses.noroot.a.GlobalsInNoRoot;
import org.jsweet.test.transpiler.source.structural.globalclasses.root.a.GlobalsInRoot;
import org.jsweet.transpiler.JSweetProblem;
import org.junit.Assert;
import org.junit.Test;
@ -204,6 +206,24 @@ public class StructuralTests extends AbstractTest {
getSourceFile(GlobalFunctionAccessFromMain.class));
}
@Test
public void testGlobalsInRoot() {
eval((logHandler, r) -> {
assertEquals("There should be no errors", 0, logHandler.reportedProblems.size());
Assert.assertEquals(true, r.get("m1"));
Assert.assertEquals(true, r.get("m2"));
} , getSourceFile(GlobalsInRoot.class));
}
@Test
public void testGlobalsInNoRoot() {
eval((logHandler, r) -> {
assertEquals("There should be no errors", 0, logHandler.reportedProblems.size());
Assert.assertEquals(true, r.get("m1"));
Assert.assertEquals(true, r.get("m2"));
} , getSourceFile(GlobalsInNoRoot.class));
}
@Test
public void testAutoImportClassesInSamePackage() {
eval((logHandler, r) -> {

33
src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/noroot/a/GlobalsInNoRoot.java Normal file
View File

@ -0,0 +1,33 @@
package org.jsweet.test.transpiler.source.structural.globalclasses.noroot.a;
import static jsweet.util.Globals.$export;
import static org.jsweet.test.transpiler.source.structural.globalclasses.noroot.a.Globals.m2;
public class GlobalsInNoRoot {
public void f1() {
Globals.m1();
}
public void f2() {
m2();
}
}
class Globals {
public static void m1() {
$export("m1", true);
}
public static void m2() {
$export("m2", true);
}
public static void main(String[] args) {
GlobalsInNoRoot o = new GlobalsInNoRoot();
o.f1();
o.f2();
}
}

33
src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/root/a/GlobalsInRoot.java Normal file
View File

@ -0,0 +1,33 @@
package org.jsweet.test.transpiler.source.structural.globalclasses.root.a;
import static jsweet.util.Globals.$export;
import static org.jsweet.test.transpiler.source.structural.globalclasses.root.a.Globals.m2;
public class GlobalsInRoot {
public void f1() {
Globals.m1();
}
public void f2() {
m2();
}
}
class Globals {
public static void m1() {
$export("m1", true);
}
public static void m2() {
$export("m2", true);
}
public static void main(String[] args) {
GlobalsInRoot o = new GlobalsInRoot();
o.f1();
o.f2();
}
}

2
src/test/java/org/jsweet/test/transpiler/source/structural/globalclasses/root/package-info.java Normal file
View File

@ -0,0 +1,2 @@
@jsweet.lang.Root
package org.jsweet.test.transpiler.source.structural.globalclasses.root;