Merge pull request #3288 from Rawi01/val-default-method

Use real type for enclosing class

src/core/lombok/javac/JavacResolution.java

@@ -244,8 +244,15 @@ public void resolveClassMember(JavacNode node) {
  }
 
  private void attrib(JCTree tree, Env<AttrContext> env) {
- if (env.enclClass.type == null) try {
- env.enclClass.type = Type.noType;
+ try {
+ if (env.enclClass.type == null) {
+ if (env.enclClass.sym != null) {
+ env.enclClass.type = env.enclClass.sym.type;
+ }
+ }
+ if (env.enclClass.type == null) {
+ env.enclClass.type = Type.noType;
+ }
  } catch (Throwable ignore) {
  // This addresses issue #1553 which involves JDK9; if it doesn't exist, we probably don't need to set it.
  }

test/transform/resource/after-delombok/ValSuperDefaultMethod.java

@@ -0,0 +1,12 @@
+// version :9
+class ValSuperDefaultMethod implements Default {
+ public void test() {
+ final java.lang.String a = "";
+ Default.super.method();
+ }
+}
+
+interface Default {
+ default void method() {
+ }
+}

test/transform/resource/after-ecj/ValSuperDefaultMethod.java

@@ -0,0 +1,14 @@
+import lombok.val;
+class ValSuperDefaultMethod implements Default {
+ ValSuperDefaultMethod() {
+ super();
+ }
+ public void test() {
+ final @val java.lang.String a = "";
+ Default.super.method();
+ }
+}
+interface Default {
+ default void method() {
+ }
+}

test/transform/resource/before/ValSuperDefaultMethod.java

@@ -0,0 +1,16 @@
+// version :9
+import lombok.val;
+
+class ValSuperDefaultMethod implements Default {
+ public void test() {
+ val a = "";
+ Default.super.method();
+ }
+
+}
+
+interface Default {
+ default void method() {
+
+ }
+}