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

@NotNull

Browse Source
This commit is contained in:
Anna.Kozlova
2016-12-14 11:31:36 +01:00
parent 2da5e59a9e
commit cb0636749a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaInheritorsGetter.java
+1 -1
View File
@@ -189,7 +189,7 @@ public class JavaInheritorsGetter extends CompletionProvider<CompletionParameter
private static boolean areInferredTypesApplicable(@NotNull PsiType[] types, PsiElement position) {
final PsiNewExpression newExpression = PsiTreeUtil.getParentOfType(position, PsiNewExpression.class, false);
if (!PsiUtil.isLanguageLevel8OrHigher(position)) {
return PsiTypesUtil.getExpectedTypeByParent(newExpression) != null;
return newExpression != null && PsiTypesUtil.getExpectedTypeByParent(newExpression) != null;
}
final PsiCallExpression methodCallExpression = PsiTreeUtil.getParentOfType(newExpression, PsiCallExpression.class, false, PsiStatement.class);
if (methodCallExpression != null && PsiUtil.isLanguageLevel8OrHigher(methodCallExpression)) {
java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
+1 -1
View File
@@ -204,7 +204,7 @@ public class PsiTypesUtil {
* Return type explicitly declared in parent
*/
@Nullable
public static PsiType getExpectedTypeByParent(PsiElement element) {
public static PsiType getExpectedTypeByParent(@NotNull PsiElement element) {
final PsiElement parent = PsiUtil.skipParenthesizedExprUp(element.getParent());
if (parent instanceof PsiVariable) {
if (PsiUtil.checkSameExpression(element, ((PsiVariable)parent).getInitializer())) {