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

Spring Security: role -> PomTarget + massive bug fixing

Browse Source
This commit is contained in:
sergey.vasiliev
2018-11-05 14:47:27 +01:00
parent 77ba2c60c5
commit e1de5d4e3f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StringExpressionHelper.java
+7 -6
View File
@@ -150,8 +150,10 @@ public class StringExpressionHelper {
@NotNull SearchScope searchScope,
int expNum) {
Set<Pair<PsiElement, String>> pairs = new java.util.HashSet<>();
for (PsiMethodCallExpression methodCallExpression : searchMethodCalls(psiMethod, searchScope)) {
final PsiExpression[] expressions = methodCallExpression.getArgumentList().getExpressions();
for (PsiCall methodCallExpression : searchMethodCalls(psiMethod, searchScope)) {
PsiExpressionList argumentList = methodCallExpression.getArgumentList();
if (argumentList == null) continue;
final PsiExpression[] expressions = argumentList.getExpressions();
if (expressions.length > expNum) {
final PsiExpression expression = expressions[expNum];
Pair<PsiElement, String> pair = evaluateExpression(expression);
@@ -165,15 +167,14 @@ public class StringExpressionHelper {
}
@NotNull
public static Set<PsiMethodCallExpression> searchMethodCalls(@NotNull final PsiMethod psiMethod, @NotNull SearchScope searchScope) {
final Set<PsiMethodCallExpression> callExpressions = new java.util.HashSet<>();
public static Set<PsiCall> searchMethodCalls(@NotNull final PsiMethod psiMethod, @NotNull SearchScope searchScope) {
final Set<PsiCall> callExpressions = new java.util.HashSet<>();
final CommonProcessors.CollectUniquesProcessor<PsiReference> consumer = new CommonProcessors.CollectUniquesProcessor<>();
MethodReferencesSearch.search(psiMethod, searchScope, true).forEach(consumer);
for (PsiReference psiReference : consumer.getResults()) {
final PsiMethodCallExpression methodCallExpression =
PsiTreeUtil.getParentOfType(psiReference.getElement(), PsiMethodCallExpression.class);
final PsiCall methodCallExpression = PsiTreeUtil.getParentOfType(psiReference.getElement(), PsiCall.class);
if (methodCallExpression != null) {
callExpressions.add(methodCallExpression);