mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
variable.getUseScope() removed from ReferencesSearch (IDEA-CR-14823)
This commit is contained in:
+2
-2
@@ -849,7 +849,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!(nextElement instanceof PsiReturnStatement) && !ReferencesSearch.search(collectionVariable, collectionVariable.getUseScope())
|
||||
if (!(nextElement instanceof PsiReturnStatement) && !ReferencesSearch.search(collectionVariable)
|
||||
.forEach(ref ->
|
||||
ref.getElement() == collectionVariable || PsiTreeUtil.isAncestor(statement, ref.getElement(), false) ||
|
||||
PsiTreeUtil.isAncestor(toArrayCandidate, ref.getElement(), false)
|
||||
@@ -1120,7 +1120,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
|
||||
PsiElement element = ((PsiReferenceExpression)lValue).resolve();
|
||||
if(!(element instanceof PsiLocalVariable)) return null;
|
||||
PsiLocalVariable var = (PsiLocalVariable)element;
|
||||
if(!ReferencesSearch.search(var, var.getUseScope()).forEach(ref -> {
|
||||
if(!ReferencesSearch.search(var).forEach(ref -> {
|
||||
return PsiTreeUtil.isAncestor(whileLoop, ref.getElement(), true);
|
||||
})) {
|
||||
return null;
|
||||
|
||||
@@ -84,7 +84,7 @@ public class InlineLocalHandler extends JavaInlineActionHandler {
|
||||
final List<PsiElement> innerClassesWithUsages = Collections.synchronizedList(new ArrayList<PsiElement>());
|
||||
final List<PsiElement> innerClassUsages = Collections.synchronizedList(new ArrayList<PsiElement>());
|
||||
final PsiClass containingClass = PsiTreeUtil.getParentOfType(local, PsiClass.class);
|
||||
final Query<PsiReference> query = ReferencesSearch.search(local, local.getUseScope());
|
||||
final Query<PsiReference> query = ReferencesSearch.search(local);
|
||||
if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> {
|
||||
if (query.findFirst() == null){
|
||||
LOG.assertTrue(refExpr == null);
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2000-2014 JetBrains s.r.o.
|
||||
* Copyright 2000-2016 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -577,7 +577,7 @@ class TypeMigrationStatementProcessor extends JavaRecursiveElementVisitor {
|
||||
final PsiExpression rExpression = assignment.getRExpression();
|
||||
if (rExpression == null) return null;
|
||||
assignment.replace(rExpression);
|
||||
if (ReferencesSearch.search(var, var.getUseScope()).forEach(new CommonProcessors.FindFirstProcessor<>())) {
|
||||
if (ReferencesSearch.search(var).forEach(new CommonProcessors.FindFirstProcessor<>())) {
|
||||
var.delete();
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -170,7 +170,7 @@ public class ThrowableNotThrownInspection extends BaseInspection {
|
||||
}
|
||||
|
||||
private static boolean isUsedElsewhere(PsiLocalVariable variable) {
|
||||
final Query<PsiReference> query = ReferencesSearch.search(variable, variable.getUseScope());
|
||||
final Query<PsiReference> query = ReferencesSearch.search(variable);
|
||||
for (PsiReference reference : query) {
|
||||
final PsiElement usage = reference.getElement();
|
||||
if (!isIgnored(usage, false)) {
|
||||
|
||||
+1
-1
@@ -252,7 +252,7 @@ public class TooBroadScopeInspectionBase extends BaseInspection {
|
||||
if (variableScope == null) {
|
||||
return;
|
||||
}
|
||||
final Query<PsiReference> query = ReferencesSearch.search(variable, variable.getUseScope());
|
||||
final Query<PsiReference> query = ReferencesSearch.search(variable);
|
||||
final Collection<PsiReference> referencesCollection = query.findAll();
|
||||
final int size = referencesCollection.size();
|
||||
if (size == 0) {
|
||||
|
||||
+1
-1
@@ -88,7 +88,7 @@ public class VariableAccessUtils {
|
||||
final PsiClass aClass = PsiUtil.getTopLevelClass(variable);
|
||||
return variableIsAssigned(variable, aClass);
|
||||
}
|
||||
return !ReferencesSearch.search(variable, variable.getUseScope()).forEach(reference -> {
|
||||
return !ReferencesSearch.search(variable).forEach(reference -> {
|
||||
final PsiElement element = reference.getElement();
|
||||
if (!(element instanceof PsiExpression)) {
|
||||
return true;
|
||||
|
||||
@@ -68,7 +68,7 @@ public class TooBroadScopeInspection extends TooBroadScopeInspectionBase {
|
||||
}
|
||||
final PsiVariable variable = (PsiVariable)variableIdentifier.getParent();
|
||||
assert variable != null;
|
||||
final Query<PsiReference> query = ReferencesSearch.search(variable, variable.getUseScope());
|
||||
final Query<PsiReference> query = ReferencesSearch.search(variable);
|
||||
final Collection<PsiReference> referenceCollection = query.findAll();
|
||||
final PsiElement[] referenceElements = new PsiElement[referenceCollection.size()];
|
||||
int index = 0;
|
||||
|
||||
+1
-1
@@ -138,7 +138,7 @@ public class WhileCanBeForeachInspection extends WhileCanBeForeachInspectionBase
|
||||
out.append(')');
|
||||
|
||||
ForCanBeForeachInspection.replaceIteratorNext(body, contentVariableName, iterator, contentType, statementToSkip, out);
|
||||
final Query<PsiReference> query = ReferencesSearch.search(iterator, iterator.getUseScope());
|
||||
final Query<PsiReference> query = ReferencesSearch.search(iterator);
|
||||
boolean deleteIterator = true;
|
||||
for (PsiReference usage : query) {
|
||||
final PsiElement element = usage.getElement();
|
||||
|
||||
Reference in New Issue
Block a user