From ee67e8ede550e4236dbd322334c7f0bfa32e3753 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 26 Nov 2019 14:48:25 +0700 Subject: [PATCH] PsiScopesUtil: cosmetic GitOrigin-RevId: 930c1f63fdd8953edc0e071df48ca3cdc259498e --- .../src/com/intellij/psi/scope/util/PsiScopesUtil.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java b/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java index fd822472d0d7..9020dfda8548 100644 --- a/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java @@ -38,6 +38,7 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; +import java.util.Objects; public class PsiScopesUtil { private static final Logger LOG = Logger.getInstance(PsiScopesUtil.class); @@ -164,9 +165,7 @@ public class PsiScopesUtil { PsiType type = null; if (qualifier instanceof PsiExpression) { type = ((PsiExpression)qualifier).getType(); - if (type != null) { - assert type.isValid() : type.getClass() + "; " + qualifier; - } + assert type == null || type.isValid() : type.getClass() + "; " + qualifier; processTypeDeclarations(type, ref, processor); } @@ -447,7 +446,7 @@ public class PsiScopesUtil { final MethodsProcessor processor, PsiManager manager, PsiMethodCallExpression call) throws MethodProcessorSetupFailedException { - LOG.assertTrue(type.isValid()); + PsiUtil.ensureValidType(type); if (type instanceof PsiClassType) { JavaResolveResult qualifierResult = ((PsiClassType)type).resolveGenerics(); return processQualifierResult(qualifierResult, processor, call); @@ -508,7 +507,7 @@ public class PsiScopesUtil { final PsiMethod dummyConstructor = factory.createConstructor(); PsiIdentifier nameIdentifier = aClass.getNameIdentifier(); if (nameIdentifier != null) { - dummyConstructor.getNameIdentifier().replace(nameIdentifier); + Objects.requireNonNull(dummyConstructor.getNameIdentifier()).replace(nameIdentifier); } processor.forceAddResult(dummyConstructor); }