azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: Extract method

Browse Source
This commit is contained in:
Alexey Sedunov
2014-01-23 16:26:54 +04:00
parent c137167290
commit 1e7297015a
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.java
+21 -17
View File
@@ -121,25 +121,13 @@ public class KotlinSafeDeleteProcessor extends JavaSafeDeleteProcessor {
JetProperty property = (JetProperty) element;
if (property.isLocal()) return findKotlinDeclarationUsages(property, allElementsToDelete, result);
return new NonCodeUsageSearchInfo(
delegateToJavaProcessorAndCombineConditions(
LightClassUtil.getLightClassPropertyMethods(property),
getCondition(Arrays.asList(allElementsToDelete)),
allElementsToDelete,
result
),
element
);
return delegateToJavaProcessor(property, allElementsToDelete, result);
}
if (element instanceof JetTypeParameter) {
Condition<PsiElement> insideDeleted = delegateToJavaProcessorAndCombineConditions(
AsJavaPackage.toPsiTypeParameters((JetTypeParameter) element),
getCondition(Arrays.asList(allElementsToDelete)),
allElementsToDelete,
result
);
findTypeParameterUsages((JetTypeParameter) element, result);
return new NonCodeUsageSearchInfo(insideDeleted, element);
JetTypeParameter typeParameter = (JetTypeParameter) element;
findTypeParameterUsages(typeParameter, result);
return delegateToJavaProcessor(typeParameter, allElementsToDelete, result);
}
if (element instanceof JetParameter) {
JetParameter jetParameter = (JetParameter) element;
@@ -155,6 +143,22 @@ public class KotlinSafeDeleteProcessor extends JavaSafeDeleteProcessor {
return getSearchInfo(element, allElementsToDelete);
}
private NonCodeUsageSearchInfo delegateToJavaProcessor(
JetDeclaration jetDeclaration,
PsiElement[] allElementsToDelete,
List<UsageInfo> result
) {
return new NonCodeUsageSearchInfo(
delegateToJavaProcessorAndCombineConditions(
AsJavaPackage.toLightElements(jetDeclaration),
getCondition(Arrays.asList(allElementsToDelete)),
allElementsToDelete,
result
),
jetDeclaration
);
}
private Condition<PsiElement> delegateToJavaProcessorAndCombineConditions(
Iterable<? extends PsiElement> elements,
Condition<PsiElement> insideDeleted,