From 45cb0ab7d0fb9e7f73b2a05f789b540c90e6bb49 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Tue, 23 Apr 2024 15:59:17 +0200
Subject: [PATCH] java: small cleanup

GitOrigin-RevId: 91d9a5fff0f0b9def8d204b4bbce9ff740115db4
---
 .../reference/RefJavaUtilImpl.java            | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaUtilImpl.java b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaUtilImpl.java
index c6089bcdd610..60c68d26de54 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaUtilImpl.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaUtilImpl.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.codeInspection.reference;
 
 import com.intellij.codeInsight.daemon.impl.analysis.GenericsHighlightUtil;
@@ -678,27 +678,23 @@ public final class RefJavaUtilImpl extends RefJavaUtil {
 
   @Override
   public void addTypeReference(UElement uElement, PsiType psiType, RefManager refManager, @Nullable RefJavaElement refMethod) {
-    if (psiType != null) {
-      final RefClass ownerClass = getOwnerClass(refManager, uElement);
-      if (ownerClass != null) {
-        psiType = psiType.getDeepComponentType();
-        if (psiType instanceof PsiClassType) {
-          PsiClass psiClass = PsiUtil.resolveClassInType(psiType);
-          if (psiClass != null && refManager.belongsToScope(psiClass)) {
-            RefClassImpl refClass = (RefClassImpl)refManager.getReference(psiClass);
-            if (refClass != null) {
-              refClass.addTypeReference(ownerClass);
-              if (refMethod != null) {
-                refClass.addClassExporter(refMethod);
-              }
-            }
-          }
-          else {
-            ((RefManagerImpl)refManager).fireNodeMarkedReferenced(psiClass, uElement.getSourcePsi());
-          }
+    if (!(psiType instanceof PsiClassType)) return;
+    final RefClass ownerClass = getOwnerClass(refManager, uElement);
+    if (ownerClass == null) return;
+    psiType = psiType.getDeepComponentType();
+    PsiClass psiClass = PsiUtil.resolveClassInType(psiType);
+    if (psiClass != null && refManager.belongsToScope(psiClass)) {
+      RefClassImpl refClass = (RefClassImpl)refManager.getReference(psiClass);
+      if (refClass != null) {
+        refClass.addTypeReference(ownerClass);
+        if (refMethod != null) {
+          refClass.addClassExporter(refMethod);
         }
       }
     }
+    else {
+      ((RefManagerImpl)refManager).fireNodeMarkedReferenced(psiClass, uElement.getSourcePsi());
+    }
   }
 
   private static boolean isAccessedForWriting(@NotNull UElement expression) {