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

Fix in change signature engine required after RESOLUTION_SCOPE became correct

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-06-12 12:52:46 +03:00
parent 89c2aca3a8
commit 45872b8126
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java
+6 -8
View File
@@ -31,6 +31,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
import org.jetbrains.kotlin.idea.codeInsight.shorten.ShortenPackage;
import org.jetbrains.kotlin.idea.core.CorePackage; import org.jetbrains.kotlin.idea.core.CorePackage;
import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo;
import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo;
@@ -72,13 +73,7 @@ public class JetFunctionCallUsage extends JetUsageInfo<JetCallElement> {
} }
}; };
private static final Function1<JetElement, ShortenReferences.Options> private static final ShortenReferences.Options SHORTEN_ARGUMENTS_OPTIONS = new ShortenReferences.Options(true, true);
SHORTEN_ARGUMENTS_OPTIONS = new Function1<JetElement, ShortenReferences.Options>() {
@Override
public ShortenReferences.Options invoke(JetElement element) {
return new ShortenReferences.Options(true, true);
}
};
private final JetFunctionDefinitionUsage<?> callee; private final JetFunctionDefinitionUsage<?> callee;
private final BindingContext context; private final BindingContext context;
@@ -408,7 +403,10 @@ public class JetFunctionCallUsage extends JetUsageInfo<JetCallElement> {
} }
} }
); );
new ShortenReferences(SHORTEN_ARGUMENTS_OPTIONS).process(argumentsToShorten);
for (JetElement argument : argumentsToShorten) {
ShortenPackage.addToShorteningWaitSet(argument, SHORTEN_ARGUMENTS_OPTIONS);
}
JetElement newElement = element; JetElement newElement = element;
if (newReceiverInfo != originalReceiverInfo) { if (newReceiverInfo != originalReceiverInfo) {