From f659d57b700b46b1deb844cfebe2b327ba0f6dab Mon Sep 17 00:00:00 2001
From: Tagir Valeev <tagir.valeev@jetbrains.com>
Date: Mon, 17 Feb 2025 13:01:33 +0100
Subject: [PATCH] [java-core] JavaPsiEnumUtil moved to codeserver.core

GitOrigin-RevId: c4f14fb79181cebe0ff87f5830b64228c0937e70
---
 .../intellij/java/codeserver/core}/JavaPsiEnumUtil.java  | 9 +++++----
 .../java/codeserver/highlighting/GenericsChecker.java    | 1 +
 .../completion/JavaCompletionContributor.java            | 6 +++++-
 3 files changed, 11 insertions(+), 5 deletions(-)
 rename java/{java-psi-impl/src/com/intellij/psi/util => codeserver/core/src/com/intellij/java/codeserver/core}/JavaPsiEnumUtil.java (89%)

diff --git a/java/java-psi-impl/src/com/intellij/psi/util/JavaPsiEnumUtil.java b/java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiEnumUtil.java
similarity index 89%
rename from java/java-psi-impl/src/com/intellij/psi/util/JavaPsiEnumUtil.java
rename to java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiEnumUtil.java
index 62c66d528abd..1289850a0d92 100644
--- a/java/java-psi-impl/src/com/intellij/psi/util/JavaPsiEnumUtil.java
+++ b/java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiEnumUtil.java
@@ -1,10 +1,11 @@
 // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.psi.util;
+package com.intellij.java.codeserver.core;
 
 import com.intellij.openapi.projectRoots.JavaSdkVersion;
 import com.intellij.openapi.projectRoots.JavaVersionService;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiImplUtil;
+import com.intellij.psi.util.PsiUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -23,7 +24,7 @@ public final class JavaPsiEnumUtil {
 
     if (!JavaVersionService.getInstance().isAtLeast(field, JavaSdkVersion.JDK_1_6)) {
       PsiType type = field.getType();
-      if (type instanceof PsiClassType && ((PsiClassType)type).resolve() == enumClass) return false;
+      if (type instanceof PsiClassType classType && classType.resolve() == enumClass) return false;
     }
 
     return !PsiUtil.isCompileTimeConstant(field);
@@ -38,8 +39,8 @@ public final class JavaPsiEnumUtil {
     if (PsiImplUtil.getSwitchLabel(expr) != null) return null;
     PsiMember constructorOrInitializer = PsiUtil.findEnclosingConstructorOrInitializer(expr);
     if (constructorOrInitializer == null || constructorOrInitializer.hasModifierProperty(PsiModifier.STATIC)) return null;
-    PsiClass enumClass = constructorOrInitializer instanceof PsiEnumConstantInitializer
-                         ? (PsiClass)constructorOrInitializer
+    PsiClass enumClass = constructorOrInitializer instanceof PsiEnumConstantInitializer initializer
+                         ? initializer
                          : constructorOrInitializer.getContainingClass();
     if (enumClass instanceof PsiEnumConstantInitializer) {
       enumClass = enumClass.getSuperClass();
diff --git a/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/GenericsChecker.java b/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/GenericsChecker.java
index 6c800a71ff39..17b8b427368c 100644
--- a/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/GenericsChecker.java
+++ b/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/GenericsChecker.java
@@ -2,6 +2,7 @@
 package com.intellij.java.codeserver.highlighting;
 
 import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil;
+import com.intellij.java.codeserver.core.JavaPsiEnumUtil;
 import com.intellij.java.codeserver.highlighting.errors.JavaCompilationError;
 import com.intellij.java.codeserver.highlighting.errors.JavaErrorKinds;
 import com.intellij.java.codeserver.highlighting.errors.JavaIncompatibleTypeErrorContext;
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
index 0cb36e1fe21a..60dfed3102c1 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
@@ -11,6 +11,7 @@ import com.intellij.codeInsight.lookup.*;
 import com.intellij.featureStatistics.FeatureUsageTracker;
 import com.intellij.icons.AllIcons;
 import com.intellij.java.JavaBundle;
+import com.intellij.java.codeserver.core.JavaPsiEnumUtil;
 import com.intellij.java.codeserver.core.JavaPsiModuleUtil;
 import com.intellij.lang.LangBundle;
 import com.intellij.lang.java.JavaLanguage;
@@ -62,7 +63,10 @@ import com.intellij.psi.impl.source.tree.JavaElementType;
 import com.intellij.psi.scope.ElementClassFilter;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.ProjectScope;
-import com.intellij.psi.util.*;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtil;
+import com.intellij.psi.util.PsiUtilCore;
+import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.ui.JBColor;
 import com.intellij.util.*;
 import com.intellij.util.containers.ContainerUtil;