decompiler: fixed SOE if referenced method name is the same as current

src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * 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.
@@ -115,11 +115,13 @@ public class LambdaProcessor {
               node_lambda.parent = node;
 
               clProcessor.getMapRootClasses().put(node_lambda.simpleName, node_lambda);
+              if (!node_lambda.lambdaInformation.is_method_reference) {
                 mapMethodsLambda.put(node_lambda.lambdaInformation.content_method_key, node_lambda.simpleName);
               }
             }
           }
         }
+      }
 
       mt.releaseResources();
     }

test/org/jetbrains/java/decompiler/SingleClassesTest.java

@@ -79,6 +79,7 @@ public class SingleClassesTest {
   @Test public void testShadowing() { doTest("pkg/TestShadowing", "pkg/Shadow", "ext/Shadow"); }
   @Test public void testStringConcat() { doTest("pkg/TestStringConcat"); }
   @Test public void testJava9StringConcat() { doTest("java9/TestJava9StringConcat"); }
+  @Test public void testMethodReferenceSameName() { doTest("pkg/TestMethodReferenceSameName"); }
 
   protected void doTest(String testFile, String... companionFiles) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();

testData/results/TestMethodReferenceSameName.dec

@@ -0,0 +1,34 @@
+public class TestMethodReferenceSameName {
+   TestMethodReferenceSameName.R1 r;
+
+   private void foo() {
+      TestMethodReferenceSameName.R1 var10000 = this.r;// 5
+      this.r.getClass();
+      (var10000::foo).run();
+   }// 6
+
+   class R1 {
+      void foo() {
+      }// 9
+   }
+}
+
+class 'TestMethodReferenceSameName' {
+   method 'foo ()V' {
+      1      4
+      5      5
+      e      6
+      13      7
+   }
+}
+
+class 'TestMethodReferenceSameName$R1' {
+   method 'foo ()V' {
+      0      11
+   }
+}
+
+Lines mapping:
+5 <-> 5
+6 <-> 8
+9 <-> 12

testData/src/pkg/TestMethodReferenceSameName.java

@@ -0,0 +1,26 @@
+/*
+ * 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 TestMethodReferenceSameName {
+  R1 r;
+
+  private void foo() {
+    ((Runnable)r::foo).run();
+  }
+
+  class R1 {
+    void foo() {}
+  }
+}