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

get rid of intellij.build.toolbox.litegen parameter and use BuildOptions.TOOLBOX_LITE_GEN_STEP to skip it instead

Browse Source 
GitOrigin-RevId: 9aac8ee4ed1ebf2a29de18a238825fafb1ab88f9
This commit is contained in:
Aleksey Rostovskiy
2019-05-27 14:04:25 +03:00
committed by intellij-monorepo-bot
parent 9215f4240b
commit 185284cee6
5558 changed files with 145807 additions and 30710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/java-psi-api/src/com/intellij/codeInsight/NullableNotNullManager.java
View File

@@ -295,7 +295,7 @@ public abstract class NullableNotNullManager {
return null;
}
private PsiAnnotation takeAnnotationFromSuperParameters(@NotNull PsiParameter owner, @NotNull List<PsiParameter> superOwners) {
private PsiAnnotation takeAnnotationFromSuperParameters(@NotNull PsiParameter owner, @NotNull List<? extends PsiParameter> superOwners) {
return RecursionManager.doPreventingRecursion(owner, true, () -> {
for (PsiParameter superOwner : superOwners) {
PsiAnnotation anno = findNullityAnnotationWithDefault(superOwner, false, false);
@@ -310,6 +310,17 @@ public abstract class NullableNotNullManager {
return findPlainAnnotation(owner, checkBases, qNames);
}
/**
* @return an annotation (if any) with the given nullability semantics on the given declaration or its type. In case of conflicts,
* type annotations are preferred.
*/
@Nullable
public PsiAnnotation findExplicitNullabilityAnnotation(@NotNull PsiModifierListOwner owner, @NotNull Nullability nullability) {
if (nullability == Nullability.UNKNOWN) return null;
List<String> names = nullability == Nullability.NULLABLE ? getNullablesWithNickNames() : getNotNullsWithNickNames();
return findPlainAnnotation(owner, false, new HashSet<>(names));
}
@Nullable
private static PsiAnnotation findPlainAnnotation(@NotNull PsiModifierListOwner owner,
boolean checkBases,