fixed incorrect constructor method reference

master
Egor.Ushakov 8 years ago
parent 7575bb57de
commit 8c440e281c
  1. 4
      src/org/jetbrains/java/decompiler/main/ClassWriter.java
  2. 1
      test/org/jetbrains/java/decompiler/SingleClassesTest.java
  3. BIN
      testData/classes/pkg/TestConstructorReference.class
  4. 16
      testData/results/TestConstructorReference.dec
  5. 24
      testData/src/pkg/TestConstructorReference.java

@ -98,8 +98,8 @@ public class ClassWriter {
buffer.append(ExprProcessor.getCastTypeName(new VarType(node.lambdaInformation.content_class_name, true))); buffer.append(ExprProcessor.getCastTypeName(new VarType(node.lambdaInformation.content_class_name, true)));
} }
buffer.append("::"); buffer.append("::")
buffer.append(node.lambdaInformation.content_method_name); .append(CodeConstants.INIT_NAME.equals(node.lambdaInformation.content_method_name) ? "new" : node.lambdaInformation.content_method_name);
} }
else { else {
// lambda method // lambda method

@ -86,6 +86,7 @@ public class SingleClassesTest {
@Test public void testJava9StringConcat() { doTest("java9/TestJava9StringConcat"); } @Test public void testJava9StringConcat() { doTest("java9/TestJava9StringConcat"); }
@Test public void testMethodReferenceSameName() { doTest("pkg/TestMethodReferenceSameName"); } @Test public void testMethodReferenceSameName() { doTest("pkg/TestMethodReferenceSameName"); }
@Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); } @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
@Test public void testConstructorReference() { doTest("pkg/TestConstructorReference"); }
@Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); } @Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); }
@Test public void testMoreAnnotations() { doTest("pkg/MoreAnnotations"); } @Test public void testMoreAnnotations() { doTest("pkg/MoreAnnotations"); }
@Test public void testTypeAnnotations() { doTest("pkg/TypeAnnotations"); } @Test public void testTypeAnnotations() { doTest("pkg/TypeAnnotations"); }

@ -0,0 +1,16 @@
public class TestConstructorReference {
void boo() {
Runnable aNew = TestConstructorReference::new;// 22
}// 23
}
class 'TestConstructorReference' {
method 'boo ()V' {
5 2
6 3
}
}
Lines mapping:
22 <-> 3
23 <-> 4

@ -0,0 +1,24 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
public class TestConstructorReference {
public TestConstructorReference() {
}
void boo() {
Runnable aNew = TestConstructorReference::new;
}
}
Loading…
Cancel
Save