diamonds: incompatible error due to cls class in default package fixed - cls file doesn't process declarations! = need to switch to mirror (IDEA-121866)

(cherry picked from commit 94d5c96730900e0f21cc3bd48143f2dea4411ae6)

java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java

@@ -278,7 +278,8 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
     buf.append("{}");
 
     try {
-      return elementFactory.createMethodFromText(buf.toString(), constructor != null ? constructor : containingClass);
+      final PsiNameIdentifierOwner owner = constructor != null ? constructor : containingClass;
+      return elementFactory.createMethodFromText(buf.toString(), owner instanceof PsiCompiledElement ? ((PsiCompiledElement)owner).getMirror() : owner);
     }
     catch (IncorrectOperationException e) {
       return null;

java/java-tests/testData/codeInsight/clsHighlighting/IDEA121866.java

@@ -0,0 +1,5 @@
+class IDEA121866  {
+  {
+    A<String> a = new A<>();
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/ClsGenerics15HighlightingTest.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2000-2014 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.
+ */
+
+package com.intellij.codeInsight;
+
+import com.intellij.pom.java.LanguageLevel;
+
+public class ClsGenerics15HighlightingTest extends ClsGenericsHighlightingTest {
+  
+  @Override
+  protected LanguageLevel getLanguageLevel() {
+    return LanguageLevel.JDK_1_5;
+  }
+
+  public void testIDEA97887() { doTest(); }
+  public void testIDEA118733() { doTest(); }
+}

java/java-tests/testSrc/com/intellij/codeInsight/ClsGenerics18HighlightingTest.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2000-2014 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.
+ */
+package com.intellij.codeInsight;
+
+import com.intellij.pom.java.LanguageLevel;
+
+public class ClsGenerics18HighlightingTest extends ClsGenericsHighlightingTest {
+  public void testIDEA121866() { doTest(); }
+
+  @Override
+  protected LanguageLevel getLanguageLevel() {
+    return LanguageLevel.JDK_1_8;
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/ClsGenericsHighlightingTest.java

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * User: anna
- * Date: 27-Jun-2007
- */
 package com.intellij.codeInsight;
 
 import com.intellij.openapi.application.ex.PathManagerEx;
@@ -31,6 +27,7 @@ import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.pom.java.LanguageLevel;
 import com.intellij.testFramework.IdeaTestCase;
 import com.intellij.testFramework.UsefulTestCase;
 import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
@@ -38,7 +35,7 @@ import com.intellij.testFramework.fixtures.*;
 import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
 
-public class ClsGenericsHighlightingTest extends UsefulTestCase {
+public abstract class ClsGenericsHighlightingTest extends UsefulTestCase {
   private CodeInsightTestFixture myFixture;
   private Module myModule;
 
@@ -54,11 +51,13 @@ public class ClsGenericsHighlightingTest extends UsefulTestCase {
     myFixture = JavaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(projectBuilder.getFixture());
     myFixture.setTestDataPath(PathManagerEx.getTestDataPath() + "/codeInsight/clsHighlighting");
     JavaModuleFixtureBuilder builder = projectBuilder.addModule(JavaModuleFixtureBuilder.class);
-    builder.setMockJdkLevel(JavaModuleFixtureBuilder.MockJdkLevel.jdk15);
+    builder.setLanguageLevel(getLanguageLevel());
     myFixture.setUp();
     myModule = builder.getFixture().getModule();
   }
 
+  protected abstract LanguageLevel getLanguageLevel();
+
   @Override
   protected void tearDown() throws Exception {
     super.tearDown();
@@ -67,10 +66,7 @@ public class ClsGenericsHighlightingTest extends UsefulTestCase {
     myModule = null;
   }
 
-  public void testIDEA97887() { doTest(); }
-  public void testIDEA118733() { doTest(); }
-
-  private void doTest() {
+  protected void doTest() {
     String name = getTestName(false);
     addLibrary(name + ".jar");
     myFixture.configureByFile(name + ".java");