From a71f76403ac41f7190c7baa85aaef6cfc3febe01 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Thu, 27 Oct 2016 10:49:26 +0700 Subject: [PATCH] variable.getUseScope() removed from ReferencesSearch (IDEA-CR-14823) --- .../streamMigration/StreamApiMigrationInspection.java | 4 ++-- .../com/intellij/refactoring/inline/InlineLocalHandler.java | 2 +- .../typeMigration/TypeMigrationStatementProcessor.java | 4 ++-- .../src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java | 2 +- .../com/siyeh/ig/dataflow/TooBroadScopeInspectionBase.java | 2 +- .../src/com/siyeh/ig/psiutils/VariableAccessUtils.java | 2 +- .../src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java | 2 +- .../com/siyeh/ig/migration/WhileCanBeForeachInspection.java | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java b/java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java index 01db9098ee8d..2d969354f53d 100644 --- a/java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java @@ -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; diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java index 52f193742000..89fa74ad3241 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java @@ -84,7 +84,7 @@ public class InlineLocalHandler extends JavaInlineActionHandler { final List innerClassesWithUsages = Collections.synchronizedList(new ArrayList()); final List innerClassUsages = Collections.synchronizedList(new ArrayList()); final PsiClass containingClass = PsiTreeUtil.getParentOfType(local, PsiClass.class); - final Query query = ReferencesSearch.search(local, local.getUseScope()); + final Query query = ReferencesSearch.search(local); if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> { if (query.findFirst() == null){ LOG.assertTrue(refExpr == null); diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java index 80ab5601ed58..80c49afb9125 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java @@ -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(); } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java index 752e8dc8c1da..b4bfcd276bc9 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNotThrownInspection.java @@ -170,7 +170,7 @@ public class ThrowableNotThrownInspection extends BaseInspection { } private static boolean isUsedElsewhere(PsiLocalVariable variable) { - final Query query = ReferencesSearch.search(variable, variable.getUseScope()); + final Query query = ReferencesSearch.search(variable); for (PsiReference reference : query) { final PsiElement usage = reference.getElement(); if (!isIgnored(usage, false)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/TooBroadScopeInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/TooBroadScopeInspectionBase.java index 6240a909c6f4..8b0a7e8766b8 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/TooBroadScopeInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/TooBroadScopeInspectionBase.java @@ -252,7 +252,7 @@ public class TooBroadScopeInspectionBase extends BaseInspection { if (variableScope == null) { return; } - final Query query = ReferencesSearch.search(variable, variable.getUseScope()); + final Query query = ReferencesSearch.search(variable); final Collection referencesCollection = query.findAll(); final int size = referencesCollection.size(); if (size == 0) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableAccessUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableAccessUtils.java index 7c1f41166bd6..60b58ff8dede 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableAccessUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/VariableAccessUtils.java @@ -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; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java index d87f133fd584..7ff351671ac9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java @@ -68,7 +68,7 @@ public class TooBroadScopeInspection extends TooBroadScopeInspectionBase { } final PsiVariable variable = (PsiVariable)variableIdentifier.getParent(); assert variable != null; - final Query query = ReferencesSearch.search(variable, variable.getUseScope()); + final Query query = ReferencesSearch.search(variable); final Collection referenceCollection = query.findAll(); final PsiElement[] referenceElements = new PsiElement[referenceCollection.size()]; int index = 0; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java index 938c464637e9..71fc396a7603 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java @@ -138,7 +138,7 @@ public class WhileCanBeForeachInspection extends WhileCanBeForeachInspectionBase out.append(')'); ForCanBeForeachInspection.replaceIteratorNext(body, contentVariableName, iterator, contentType, statementToSkip, out); - final Query query = ReferencesSearch.search(iterator, iterator.getUseScope()); + final Query query = ReferencesSearch.search(iterator); boolean deleteIterator = true; for (PsiReference usage : query) { final PsiElement element = usage.getElement();