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

cleanup, bring notnull back

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-07-27 14:27:05 +03:00
parent a937d18791
commit 1e41f2d63b
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+25 -28
View File
@@ -79,8 +79,6 @@ import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.intellij.openapi.util.Pair.pair;
/**
* @author cdr
* @since Jul 30, 2002
@@ -1722,37 +1720,36 @@ public class HighlightUtil extends HighlightUtilBase {
return accessProblemTextAndFixes(ref, resolved, result).first;
}
private static Pair<String, List<IntentionAction>> accessProblemTextAndFixes(PsiElement reference,
PsiElement resolved,
JavaResolveResult result) {
@NotNull
private static Pair<String, List<IntentionAction>> accessProblemTextAndFixes(@NotNull PsiElement reference,
@NotNull PsiElement resolved,
@NotNull JavaResolveResult result) {
assert resolved instanceof PsiModifierListOwner : resolved;
PsiModifierListOwner refElement = (PsiModifierListOwner)resolved;
String symbolName = HighlightMessageUtil.getSymbolName(refElement, result.getSubstitutor());
if (refElement.hasModifierProperty(PsiModifier.PRIVATE)) {
String containerName = getContainerName(refElement, result.getSubstitutor());
return pair(JavaErrorMessages.message("private.symbol", symbolName, containerName), null);
return Pair.create(JavaErrorMessages.message("private.symbol", symbolName, containerName), null);
}
else if (refElement.hasModifierProperty(PsiModifier.PROTECTED)) {
if (refElement.hasModifierProperty(PsiModifier.PROTECTED)) {
String containerName = getContainerName(refElement, result.getSubstitutor());
return pair(JavaErrorMessages.message("protected.symbol", symbolName, containerName), null);
return Pair.create(JavaErrorMessages.message("protected.symbol", symbolName, containerName), null);
}
PsiClass packageLocalClass = getPackageLocalClassInTheMiddle(reference);
if (packageLocalClass != null) {
refElement = packageLocalClass;
symbolName = HighlightMessageUtil.getSymbolName(refElement, result.getSubstitutor());
}
if (refElement.hasModifierProperty(PsiModifier.PACKAGE_LOCAL) || packageLocalClass != null) {
String containerName = getContainerName(refElement, result.getSubstitutor());
return Pair.create(JavaErrorMessages.message("package.local.symbol", symbolName, containerName), null);
}
else {
PsiClass packageLocalClass = getPackageLocalClassInTheMiddle(reference);
if (packageLocalClass != null) {
refElement = packageLocalClass;
symbolName = HighlightMessageUtil.getSymbolName(refElement, result.getSubstitutor());
}
if (refElement.hasModifierProperty(PsiModifier.PACKAGE_LOCAL) || packageLocalClass != null) {
String containerName = getContainerName(refElement, result.getSubstitutor());
return pair(JavaErrorMessages.message("package.local.symbol", symbolName, containerName), null);
}
else {
String containerName = getContainerName(refElement, result.getSubstitutor());
ErrorWithFixes problem = checkModuleAccess(resolved, reference, symbolName, containerName);
if (problem != null) return pair(problem.message, problem.fixes);
return pair(JavaErrorMessages.message("visibility.access.problem", symbolName, containerName), null);
}
String containerName = getContainerName(refElement, result.getSubstitutor());
ErrorWithFixes problem = checkModuleAccess(resolved, reference, symbolName, containerName);
if (problem != null) return Pair.create(problem.message, problem.fixes);
return Pair.create(JavaErrorMessages.message("visibility.access.problem", symbolName, containerName), null);
}
}
@@ -1775,14 +1772,14 @@ public class HighlightUtil extends HighlightUtilBase {
}
private static ErrorWithFixes checkAccess(JavaModuleSystemEx system, PsiElement target, PsiElement place) {
if (target instanceof PsiClass) return system.checkAccess(((PsiClass)target), place);
if (target instanceof PsiPackage) return system.checkAccess(((PsiPackage)target), place);
if (target instanceof PsiClass) return system.checkAccess((PsiClass)target, place);
if (target instanceof PsiPackage) return system.checkAccess((PsiPackage)target, place);
return null;
}
private static boolean isAccessible(JavaModuleSystem system, PsiElement target, PsiElement place) {
if (target instanceof PsiClass) return system.isAccessible(((PsiClass)target), place);
if (target instanceof PsiPackage) return system.isAccessible(((PsiPackage)target), place);
if (target instanceof PsiClass) return system.isAccessible((PsiClass)target, place);
if (target instanceof PsiPackage) return system.isAccessible((PsiPackage)target, place);
return true;
}
@@ -2017,7 +2014,7 @@ public class HighlightUtil extends HighlightUtilBase {
while (lastChild instanceof PsiComment || lastChild instanceof PsiWhiteSpace) {
lastChild = lastChild.getPrevSibling();
}
if (!(PsiUtil.isJavaToken(lastChild, JavaTokenType.COLON))) {
if (!PsiUtil.isJavaToken(lastChild, JavaTokenType.COLON)) {
int start = statement.getTextRange().getEndOffset();
int end = statement.getTextRange().getEndOffset() + 1;
String description = JavaErrorMessages.message("switch.colon.expected.after.case.label");