MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

ensure language level is retrieved from analyzed method when method hierarchy is processed

Browse Source
This commit is contained in:
Anna Kozlova
2015-02-12 18:48:57 +01:00
parent 8f46e89025
commit 6d0e359bbc
5 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
View File

@@ -152,7 +152,7 @@ public class HighlightMethodUtil {
: includeRealPositionInfo ? method.getReturnTypeElement().getTextRange() : TextRange.EMPTY_RANGE;
HighlightInfo highlightInfo = checkSuperMethodSignature(superMethod, superMethodSignature, superReturnType, method, methodSignature,
returnType, JavaErrorMessages.message("incompatible.return.type"),
toHighlight, languageLevel);
toHighlight, PsiUtil.getLanguageLevel(method));
if (highlightInfo != null) return highlightInfo;
}

3
java/java-tests/testData/codeInsight/multipleJdks/java3/p/LanguageLevelInReturnTypeCheck.java Normal file
View File

@@ -0,0 +1,3 @@
package p;
class C extends B {}

0
java/java-tests/testData/codeInsight/multipleJdks/java6/p/StaticCallOnChildWithNotAccessibleParent.java → java/java-tests/testData/codeInsight/multipleJdks/java3/p/StaticCallOnChildWithNotAccessibleParent.java
View File

9
java/java-tests/testData/codeInsight/multipleJdks/java7/p/LanguageLevelInReturnTypeCheck.java Normal file
View File

@@ -0,0 +1,9 @@
package p;
public class B extends A {
protected java.util.List<String> get() {return null;}
}
class A {
protected java.util.List<String> get() {return null;}
}

23
java/java-tests/testSrc/com/intellij/codeInsight/MultipleJdksHighlightingTest.java
View File

@@ -16,12 +16,12 @@
package com.intellij.codeInsight;
import com.intellij.idea.Bombed;
import com.intellij.openapi.application.ex.PathManagerEx;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.ModuleRootModificationUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.testFramework.IdeaTestCase;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.UsefulTestCase;
@@ -29,12 +29,10 @@ import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
import com.intellij.testFramework.fixtures.*;
import com.intellij.util.Consumer;
import java.util.Calendar;
public class MultipleJdksHighlightingTest extends UsefulTestCase {
private CodeInsightTestFixture myFixture;
private Module myJava6Module;
private Module myJava3Module;
private Module myJava7Module;
private Module myJava8Module;
@@ -48,7 +46,7 @@ public class MultipleJdksHighlightingTest extends UsefulTestCase {
super.tearDown();
myFixture.tearDown();
myFixture = null;
myJava6Module = null;
myJava3Module = null;
myJava7Module = null;
myJava8Module = null;
}
@@ -61,18 +59,19 @@ public class MultipleJdksHighlightingTest extends UsefulTestCase {
myFixture.setTestDataPath(PathManagerEx.getTestDataPath() + "/codeInsight/multipleJdks");
final JavaModuleFixtureBuilder[] builders = new JavaModuleFixtureBuilder[3];
builders[0] = projectBuilder.addModule(JavaModuleFixtureBuilder.class);
builders[0].setLanguageLevel(LanguageLevel.JDK_1_3);
builders[1] = projectBuilder.addModule(JavaModuleFixtureBuilder.class);
builders[2] = projectBuilder.addModule(JavaModuleFixtureBuilder.class);
myFixture.setUp();
myJava6Module = builders[0].getFixture().getModule();
myJava3Module = builders[0].getFixture().getModule();
myJava7Module = builders[1].getFixture().getModule();
myJava8Module = builders[2].getFixture().getModule();
ModuleRootModificationUtil.updateModel(myJava6Module, new Consumer<ModifiableRootModel>() {
ModuleRootModificationUtil.updateModel(myJava3Module, new Consumer<ModifiableRootModel>() {
@Override
public void consume(ModifiableRootModel model) {
model.addModuleOrderEntry(myJava7Module);
model.setSdk(IdeaTestUtil.getMockJdk17());
String contentUrl = VfsUtilCore.pathToUrl(myFixture.getTempDirPath()) + "/java6";
String contentUrl = VfsUtilCore.pathToUrl(myFixture.getTempDirPath()) + "/java3";
model.addContentEntry(contentUrl).addSourceFolder(contentUrl, false);
}
});
@@ -152,6 +151,12 @@ public class MultipleJdksHighlightingTest extends UsefulTestCase {
doTest3Modules();
}
public void testLanguageLevelInReturnTypeCheck() throws Exception {
final String name = getTestName(false);
myFixture.configureByFiles("java3/p/" + name + ".java", "java7/p/" + name + ".java");
myFixture.checkHighlighting();
}
private void doTestWithoutLibrary() {
final String name = getTestName(false);
myFixture.configureByFiles("java7/p/" + name + ".java", "java8/p/" + name + ".java");
@@ -160,7 +165,7 @@ public class MultipleJdksHighlightingTest extends UsefulTestCase {
private void doTest3Modules() {
final String name = getTestName(false);
myFixture.configureByFiles("java6/p/" + name + ".java", "java7/p/" + name + ".java", "java8/p/" + name + ".java");
myFixture.configureByFiles("java3/p/" + name + ".java", "java7/p/" + name + ".java", "java8/p/" + name + ".java");
myFixture.checkHighlighting();
}