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] JavaPsiVariableUtil moved to codeserver.core

Browse Source 
GitOrigin-RevId: d439121bd3795e5ffe13a43152c2a78973e24fcc
This commit is contained in:
Tagir Valeev
2025-02-18 09:36:18 +00:00
committed by intellij-monorepo-bot
parent e6691d9ea8
commit d0e7c1e66e
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/util/JavaPsiVariableUtil.java → java/codeserver/core/src/com/intellij/java/codeserver/core/JavaPsiVariableUtil.java
+7 -9
View File
@@ -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);
java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/StatementChecker.java
+1
View File
@@ -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;
java/java-analysis-impl/src/com/siyeh/ig/psiutils/InstanceOfUtils.java
+1 -1
View File
@@ -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;
java/java-impl-refactorings/intellij.java.impl.refactorings.iml
+1
View File
@@ -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>
java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/inplace/InplaceExtractUtils.kt
+1 -1
View File
@@ -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