MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Class/package clash check fixed for case-insensitive FS

Browse Source
This commit is contained in:
Roman Shevchenko
2013-02-01 21:35:11 +04:00
parent 1c8e6b59ed
commit 4c1093bfa1
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java
+10 -6
View File
@@ -282,10 +282,14 @@ public class HighlightClassUtil {
PsiElement file = aClass.getParent();
if (file instanceof PsiJavaFile && !((PsiJavaFile)file).getPackageName().isEmpty()) {
PsiElement directory = file.getParent();
if (directory instanceof PsiDirectory && ((PsiDirectory)directory).findSubdirectory(aClass.getName()) != null) {
String message = JavaErrorMessages.message("class.clashes.with.package", name);
TextRange range = HighlightNamesUtil.getClassDeclarationTextRange(aClass);
return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, range, message);
if (directory instanceof PsiDirectory) {
String simpleName = aClass.getName();
PsiDirectory subDirectory = ((PsiDirectory)directory).findSubdirectory(simpleName);
if (subDirectory != null && simpleName.equals(subDirectory.getName())) {
String message = JavaErrorMessages.message("class.clashes.with.package", name);
TextRange range = HighlightNamesUtil.getClassDeclarationTextRange(aClass);
return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, range, message);
}
}
}
@@ -691,7 +695,7 @@ public class HighlightClassUtil {
IntentionAction fix = QUICK_FIX_FACTORY.createModifierListFix(aClass, PsiModifier.STATIC, false, false);
QuickFixAction.registerQuickFixAction(info, fix);
}
} else if (aClass instanceof PsiAnonymousClass) {
final PsiClass baseClass = PsiUtil.resolveClassInType(((PsiAnonymousClass)aClass).getBaseClassType());
if (baseClass != null && baseClass.isInterface()) {
@@ -982,7 +986,7 @@ public class HighlightClassUtil {
PsiNewExpression newExpression =
(PsiNewExpression)JavaPsiFacade.getElementFactory(project).createExpressionFromText(startElement.getText() + "{}", startElement);
newExpression = (PsiNewExpression)startElement.replace(newExpression);
final PsiClass psiClass = newExpression.getAnonymousClass();
final PsiClass psiClass = newExpression.getAnonymousClass();
if (psiClass == null) return;
PsiClassType baseClassType = ((PsiAnonymousClass)psiClass).getBaseClassType();
PsiClass resolve = baseClassType.resolve();
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/packageClassClash/pkg/Sub.java
+3
View File
@@ -0,0 +1,3 @@
package pkg;
public class Sub { }
java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingTest.java
+4
View File
@@ -295,6 +295,10 @@ public class AdvHighlightingTest extends DaemonAnalyzerTestCase {
}
public void testPackageAndClassConflict3() throws Exception {
doTest(BASE_PATH + "/packageClassClash/pkg/Sub.java", BASE_PATH + "/packageClassClash", false, false);
}
public void testDefaultPackageAndClassConflict() throws Exception {
doTest(BASE_PATH + "/packageClassClash/java/lang.java", false, false);
}