Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
0d9fc78b
Commit
0d9fc78b
authored
10 years ago
by
Anna Kozlova
Browse files
Options
Download
Email Patches
Plain Diff
deep delete parameter: disable for recursive calls
parent
828ab444
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
java/java-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteJavaCallerChooser.java
+13
-5
...j/refactoring/safeDelete/SafeDeleteJavaCallerChooser.java
with
13 additions
and
5 deletions
+13
-5
java/java-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteJavaCallerChooser.java
+
13
-
5
View file @
0d9fc78b
...
@@ -23,6 +23,7 @@ import com.intellij.openapi.util.Ref;
...
@@ -23,6 +23,7 @@ import com.intellij.openapi.util.Ref;
import
com.intellij.psi.*
;
import
com.intellij.psi.*
;
import
com.intellij.psi.search.LocalSearchScope
;
import
com.intellij.psi.search.LocalSearchScope
;
import
com.intellij.psi.search.searches.ReferencesSearch
;
import
com.intellij.psi.search.searches.ReferencesSearch
;
import
com.intellij.psi.util.PsiTreeUtil
;
import
com.intellij.psi.util.PsiUtil
;
import
com.intellij.psi.util.PsiUtil
;
import
com.intellij.refactoring.changeSignature.MethodNodeBase
;
import
com.intellij.refactoring.changeSignature.MethodNodeBase
;
import
com.intellij.refactoring.changeSignature.inCallers.JavaCallerChooser
;
import
com.intellij.refactoring.changeSignature.inCallers.JavaCallerChooser
;
...
@@ -110,6 +111,7 @@ class SafeDeleteJavaCallerChooser extends JavaCallerChooser {
...
@@ -110,6 +111,7 @@ class SafeDeleteJavaCallerChooser extends JavaCallerChooser {
if
(
resolve
instanceof
PsiParameter
&&
!((
PsiParameter
)
resolve
).
isVarArgs
())
{
if
(
resolve
instanceof
PsiParameter
&&
!((
PsiParameter
)
resolve
).
isVarArgs
())
{
final
PsiElement
scope
=
((
PsiParameter
)
resolve
).
getDeclarationScope
();
final
PsiElement
scope
=
((
PsiParameter
)
resolve
).
getDeclarationScope
();
if
(
scope
instanceof
PsiMethod
)
{
if
(
scope
instanceof
PsiMethod
)
{
final
Ref
<
Boolean
>
ref
=
new
Ref
<
Boolean
>(
false
);
if
(
ReferencesSearch
.
search
(
resolve
,
new
LocalSearchScope
(
scope
)).
forEach
(
new
Processor
<
PsiReference
>()
{
if
(
ReferencesSearch
.
search
(
resolve
,
new
LocalSearchScope
(
scope
)).
forEach
(
new
Processor
<
PsiReference
>()
{
@Override
@Override
public
boolean
process
(
PsiReference
reference
)
{
public
boolean
process
(
PsiReference
reference
)
{
...
@@ -118,15 +120,21 @@ class SafeDeleteJavaCallerChooser extends JavaCallerChooser {
...
@@ -118,15 +120,21 @@ class SafeDeleteJavaCallerChooser extends JavaCallerChooser {
final
PsiElement
parent
=
element
.
getParent
();
final
PsiElement
parent
=
element
.
getParent
();
if
(
parent
instanceof
PsiExpressionList
)
{
if
(
parent
instanceof
PsiExpressionList
)
{
final
PsiElement
gParent
=
parent
.
getParent
();
final
PsiElement
gParent
=
parent
.
getParent
();
if
(
gParent
instanceof
PsiCallExpression
&&
if
(
gParent
instanceof
PsiCallExpression
)
{
nodeMethod
.
equals
(((
PsiCallExpression
)
gParent
).
resolveMethod
()))
{
final
PsiMethod
resolved
=
((
PsiCallExpression
)
gParent
).
resolveMethod
();
return
true
;
if
(
scope
.
equals
(
resolved
))
{
return
true
;
}
if
(
nodeMethod
.
equals
(
resolved
))
{
ref
.
set
(
true
);
return
true
;
}
}
}
}
}
}
}
return
false
;
return
false
;
}
}
}))
{
})
&&
ref
.
get
()
)
{
return
(
PsiParameter
)
resolve
;
return
(
PsiParameter
)
resolve
;
}
}
}
}
...
@@ -163,7 +171,7 @@ class SafeDeleteJavaCallerChooser extends JavaCallerChooser {
...
@@ -163,7 +171,7 @@ class SafeDeleteJavaCallerChooser extends JavaCallerChooser {
return
new
Condition
<
PsiMethod
>()
{
return
new
Condition
<
PsiMethod
>()
{
@Override
@Override
public
boolean
value
(
PsiMethod
method
)
{
public
boolean
value
(
PsiMethod
method
)
{
return
getParameter
(
method
)
!=
null
;
return
!
myCurrentMethod
.
equals
(
method
)
&&
getParameter
(
method
)
!=
null
;
}
}
};
};
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment