also test getter/setter and constructor params

Author: bishabosha

compiler/src/dotty/tools/dotc/printing/OutlinePrinter.scala

@@ -22,9 +22,11 @@ class OutlinePrinter private (_ctx: Context) extends RefinedPrinter(_ctx) {
 
   /* Typical patterns seen in output of typer for Java code, plus the output of unpickling an ELIDED tree */
   def isElidableExpr[T <: Untyped](tree: Tree[T]): Boolean = tree match {
-    case tree: Ident[T] if tree.name == nme.WILDCARD => true
-    case tree: Select[T] if tree.symbol == defn.Predef_undefined => true
-    case Apply(Select(tree: New[T], nme.CONSTRUCTOR), Nil) if tree.tpt.typeOpt.typeSymbol.is(Module) => true
+    case tree: Ident[T] if tree.name == nme.WILDCARD => true // `ELIDED exprType`
+    case tree: Literal[T] => true // e.g. `()`
+    case tree: Select[T] if tree.symbol == defn.Predef_undefined => true // e.g. `Predef.???`
+    case Apply(Select(tree: New[T], nme.CONSTRUCTOR), Nil)
+    if tree.tpt.typeOpt.typeSymbol.is(Module) => true // e.g. `new foo.Foo$()` (rhs of a module val)
     case _ => false
   }
 

sbt-test/pipelining/Yjava-tasty-fromjavaobject/a/src/main/scala/a/A.java

@@ -5,14 +5,30 @@
 public class A {
 
   public static class Inner<T> extends Object {
-    public Inner() {}
+    public T field1;
+    public T getter1() { return field1; }
+    public Object field2;
+    public Object getter2() { return field2; }
+
+    public Inner(T param1, Object param2) {
+      this.field1 = param1;
+      this.field2 = param2;
+    }
 
     public void meth1(T arg) {}
     public <U extends T> void meth2(U arg) {}
   }
 
   public static class Inner_sel<T> extends java.lang.Object {
-    public Inner_sel() {}
+    public T field1;
+    public T getter1() { return field1; }
+    public java.lang.Object field2;
+    public java.lang.Object getter2() { return field2; }
+
+    public Inner_sel(T param1, java.lang.Object param2) {
+      this.field1 = param1;
+      this.field2 = param2;
+    }
 
     public void meth1(T arg) {}
     public <U extends T> void meth2(U arg) {}

sbt-test/pipelining/Yjava-tasty-fromjavaobject/a/src/main/scala/a/AImport.java

@@ -8,7 +8,15 @@
 public class AImport {
 
   public static class Inner<T> extends Object {
-    public Inner() {}
+    public T field1;
+    public T getter1() { return field1; }
+    public Object field2;
+    public Object getter2() { return field2; }
+
+    public Inner(T param1, Object param2) {
+      this.field1 = param1;
+      this.field2 = param2;
+    }
 
     public void meth1(T arg) {}
   }

sbt-test/pipelining/Yjava-tasty-fromjavaobject/b/src/main/scala/b/B.scala

@@ -7,8 +7,8 @@ object B {
 
   val newA = new A
 
-  val newAInner = new A.Inner[Int]()
-  val newAInner_sel = new A.Inner_sel[Int]()
+  val newAInner = new A.Inner[Int](23, true)
+  val newAInner_sel = new A.Inner_sel[Int](23, true)
 
   @main
   def test = {
@@ -36,6 +36,20 @@ object B {
     newAInner_sel.meth1(1) // OK
     newAInner_sel.meth2(1) // OK
 
+    assert((newAInner.field1: Int) == 23) // OK
+    newAInner.field1 = 31 // OK
+    assert((newAInner.getter1: Int) == 31) // OK
+    assert(newAInner.field2 == true) // OK
+    newAInner.field2 = false // OK
+    assert(newAInner.getter2 == false) // OK
+
+    assert((newAInner_sel.field1: Int) == 23) // OK
+    newAInner_sel.field1 = 31 // OK
+    assert((newAInner_sel.getter1: Int) == 31) // OK
+    assert(newAInner_sel.field2 == true) // OK
+    newAInner_sel.field2 = false // OK
+    assert(newAInner_sel.getter2 == false) // OK
+
     BImport.testImport() // OK
   }
 }

sbt-test/pipelining/Yjava-tasty-fromjavaobject/b/src/main/scala/b/BImport.scala

@@ -6,7 +6,7 @@ object BImport {
 
   val newA = new AImport
 
-  val newAInner = new AImport.Inner[Int]()
+  val newAInner = new AImport.Inner[Int](23, true)
 
   def testImport() = {
     newA.meth1(1) // OK
@@ -18,6 +18,14 @@ object BImport {
     newA.meth7(ai: _*) // OK (will copy the array at Erasure)
 
     newAInner.meth1(1) // OK
+
+    assert((newAInner.field1: Int) == 23) // OK
+    newAInner.field1 = 31 // OK
+    assert((newAInner.getter1: Int) == 31) // OK
+
+    assert(newAInner.field2 == true) // OK
+    newAInner.field2 = false // OK
+    assert(newAInner.getter2 == false) // OK
   }
 }