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

[java-core] JavaPsiEnumUtil moved to codeserver.core

Browse Source 
GitOrigin-RevId: c4f14fb79181cebe0ff87f5830b64228c0937e70
This commit is contained in:
Tagir Valeev
2025-02-18 09:36:18 +00:00
committed by intellij-monorepo-bot
parent 4abe8788e2
commit f659d57b70
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/util/JavaPsiEnumUtil.java → java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiEnumUtil.java
+5 -4
View File
@@ -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();
java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/GenericsChecker.java
+1
View File
@@ -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;
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+5 -1
View File
@@ -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;