From 492c6bdaeca864dccfe09e2d4081be0ecc007348 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Mon, 17 Feb 2025 13:03:30 +0100 Subject: [PATCH] [java-core] JavaPsiSealedUtil moved to codeserver.core GitOrigin-RevId: d4d5b683216563029bf817a964fbd020c33ac990 --- .../com/intellij/java/codeserver/core}/JavaPsiSealedUtil.java | 3 ++- .../intellij/java/codeserver/highlighting/PatternChecker.java | 3 ++- .../daemon/impl/analysis/PatternHighlightingModel.java | 1 + .../impl/analysis/PatternsInSwitchBlockHighlightingModel.java | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) rename java/{java-psi-impl/src/com/intellij/psi/util => codeserver/core/src/com/intellij/java/codeserver/core}/JavaPsiSealedUtil.java (98%) diff --git a/java/java-psi-impl/src/com/intellij/psi/util/JavaPsiSealedUtil.java b/java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiSealedUtil.java similarity index 98% rename from java/java-psi-impl/src/com/intellij/psi/util/JavaPsiSealedUtil.java rename to java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiSealedUtil.java index 536a3b73dbeb..1e6af2551407 100644 --- a/java/java-psi-impl/src/com/intellij/psi/util/JavaPsiSealedUtil.java +++ b/java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiSealedUtil.java @@ -1,7 +1,8 @@ // 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.psi.*; +import com.intellij.psi.util.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/PatternChecker.java b/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/PatternChecker.java index 995441d881a4..beee068056ec 100644 --- a/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/PatternChecker.java +++ b/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/PatternChecker.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.JavaPsiSealedUtil; import com.intellij.java.codeserver.highlighting.errors.JavaErrorKinds; import com.intellij.java.codeserver.highlighting.errors.JavaIncompatibleTypeErrorContext; import com.intellij.openapi.diagnostic.Logger; @@ -25,7 +26,7 @@ import java.util.stream.Collectors; import static com.intellij.psi.PsiModifier.SEALED; import static com.intellij.util.ObjectUtils.tryCast; -import static java.util.Objects.*; +import static java.util.Objects.hash; final class PatternChecker { private static final Logger LOG = Logger.getInstance(PatternChecker.class); diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PatternHighlightingModel.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PatternHighlightingModel.java index fd6009732228..7ca70ddbabf8 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PatternHighlightingModel.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PatternHighlightingModel.java @@ -9,6 +9,7 @@ import com.intellij.codeInsight.daemon.impl.quickfix.AddMissingDeconstructionCom import com.intellij.codeInsight.daemon.impl.quickfix.AddMissingDeconstructionComponentsFix.Pattern; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.QuickFixFactory; +import com.intellij.java.codeserver.core.JavaPsiSealedUtil; import com.intellij.modcommand.ModCommandAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.TextRange; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PatternsInSwitchBlockHighlightingModel.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PatternsInSwitchBlockHighlightingModel.java index a89edc8453b8..be914ecdb74b 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PatternsInSwitchBlockHighlightingModel.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PatternsInSwitchBlockHighlightingModel.java @@ -5,6 +5,7 @@ import com.intellij.codeInsight.daemon.JavaErrorBundle; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.QuickFixFactory; +import com.intellij.java.codeserver.core.JavaPsiSealedUtil; import com.intellij.modcommand.ModCommandAction; import com.intellij.openapi.util.Comparing; import com.intellij.pom.java.JavaFeature;