diff --git a/java/java-psi-impl/src/com/intellij/psi/util/JavaPsiVariableUtil.java b/java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiVariableUtil.java
similarity index 92%
rename from java/java-psi-impl/src/com/intellij/psi/util/JavaPsiVariableUtil.java
rename to java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiVariableUtil.java
index 0b830d3fbe11..609b2c89131d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/util/JavaPsiVariableUtil.java
+++ b/java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiVariableUtil.java
@@ -1,11 +1,13 @@
 // 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.scope.PatternResolveState;
 import com.intellij.psi.scope.processor.VariablesNotProcessor;
 import com.intellij.psi.scope.util.PsiScopesUtil;
 import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -21,8 +23,7 @@ public final class JavaPsiVariableUtil {
     PsiElement scope = variable.getParent();
     PsiElement[] children = scope.getChildren();
     for (PsiElement child : children) {
-      if (child instanceof PsiVariable) {
-        PsiVariable psiVariable = (PsiVariable)child;
+      if (child instanceof PsiVariable psiVariable) {
         if (child.equals(variable)) continue;
         if (Objects.equals(variable.getName(), psiVariable.getName())) {
           return psiVariable;
@@ -48,8 +49,7 @@ public final class JavaPsiVariableUtil {
         hint = hint.invert();
         continue;
       }
-      if (parent instanceof PsiPolyadicExpression) {
-        PsiPolyadicExpression expression = (PsiPolyadicExpression)parent;
+      if (parent instanceof PsiPolyadicExpression expression) {
         IElementType tokenType = expression.getOperationTokenType();
         if (tokenType.equals(JavaTokenType.ANDAND) || tokenType.equals(JavaTokenType.OROR)) {
           PatternResolveState targetHint = PatternResolveState.fromBoolean(tokenType.equals(JavaTokenType.OROR));
@@ -62,8 +62,7 @@ public final class JavaPsiVariableUtil {
           continue;
         }
       }
-      if (parent instanceof PsiConditionalExpression) {
-        PsiConditionalExpression conditional = (PsiConditionalExpression)parent;
+      if (parent instanceof PsiConditionalExpression conditional) {
         PsiExpression thenExpression = conditional.getThenExpression();
         if (lastParent == thenExpression) {
           conditional.getCondition()
@@ -120,8 +119,7 @@ public final class JavaPsiVariableUtil {
         oldVariable = findSamePatternVariableInBranches((PsiPatternVariable)variable);
       }
     }
-    else if (variable instanceof PsiField) {
-      PsiField field = (PsiField)variable;
+    else if (variable instanceof PsiField field) {
       PsiClass aClass = field.getContainingClass();
       if (aClass == null) return null;
       PsiField fieldByName = aClass.findFieldByName(variable.getName(), false);
diff --git a/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/StatementChecker.java b/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/StatementChecker.java
index 8038ba53de14..902706cd009b 100644
--- a/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/StatementChecker.java
+++ b/java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/StatementChecker.java
@@ -4,6 +4,7 @@ package com.intellij.java.codeserver.highlighting;
 import com.intellij.codeInsight.ExceptionUtil;
 import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil;
 import com.intellij.core.JavaPsiBundle;
+import com.intellij.java.codeserver.core.JavaPsiVariableUtil;
 import com.intellij.java.codeserver.highlighting.errors.JavaErrorKinds;
 import com.intellij.java.codeserver.highlighting.errors.JavaIncompatibleTypeErrorContext;
 import com.intellij.pom.java.JavaFeature;
diff --git a/java/java-analysis-impl/src/com/siyeh/ig/psiutils/InstanceOfUtils.java b/java/java-analysis-impl/src/com/siyeh/ig/psiutils/InstanceOfUtils.java
index 4f9289874c4c..981dad8b192c 100644
--- a/java/java-analysis-impl/src/com/siyeh/ig/psiutils/InstanceOfUtils.java
+++ b/java/java-analysis-impl/src/com/siyeh/ig/psiutils/InstanceOfUtils.java
@@ -6,13 +6,13 @@ import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil;
 import com.intellij.codeInspection.dataFlow.ContractValue;
 import com.intellij.codeInspection.dataFlow.JavaMethodContractUtil;
 import com.intellij.codeInspection.dataFlow.MethodContract;
+import com.intellij.java.codeserver.core.JavaPsiVariableUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.controlFlow.*;
 import com.intellij.psi.impl.source.DummyHolder;
 import com.intellij.psi.impl.source.tree.JavaSharedImplUtil;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.JavaPsiPatternUtil;
-import com.intellij.psi.util.JavaPsiVariableUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.ObjectUtils;
diff --git a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
index aa9114c6a6aa..35d4eb6fb3e0 100644
--- a/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
+++ b/java/java-impl-refactorings/intellij.java.impl.refactorings.iml
@@ -25,5 +25,6 @@
     <orderEntry type="module" module-name="intellij.platform.diff.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.java.codeserver.core" />
   </component>
 </module>
\ No newline at end of file
diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/inplace/InplaceExtractUtils.kt b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/inplace/InplaceExtractUtils.kt
index 63111275628b..44c5d1704151 100644
--- a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/inplace/InplaceExtractUtils.kt
+++ b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/inplace/InplaceExtractUtils.kt
@@ -12,6 +12,7 @@ import com.intellij.ide.ui.IdeUiService
 import com.intellij.internal.statistic.collectors.fus.ui.GotItUsageCollector
 import com.intellij.internal.statistic.collectors.fus.ui.GotItUsageCollectorGroup
 import com.intellij.internal.statistic.eventLog.events.FusInputEvent
+import com.intellij.java.codeserver.core.JavaPsiVariableUtil
 import com.intellij.java.refactoring.JavaRefactoringBundle
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.IdeActions
@@ -35,7 +36,6 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.wm.WindowManager
 import com.intellij.psi.*
-import com.intellij.psi.util.JavaPsiVariableUtil
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.PsiUtil
 import com.intellij.refactoring.RefactoringBundle