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

Renamed method

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-04-21 18:49:56 +04:00
parent 0e28cf1561
commit cedf6b2b54
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java
+1 -1
View File
@@ -116,7 +116,7 @@ public class AddFunctionParametersFix extends ChangeFunctionSignatureFix {
public void configure(@NotNull JetChangeSignatureData changeSignatureData, @NotNull BindingContext bindingContext) { public void configure(@NotNull JetChangeSignatureData changeSignatureData, @NotNull BindingContext bindingContext) {
List<ValueParameterDescriptor> parameters = functionDescriptor.getValueParameters(); List<ValueParameterDescriptor> parameters = functionDescriptor.getValueParameters();
List<? extends ValueArgument> arguments = callElement.getValueArguments(); List<? extends ValueArgument> arguments = callElement.getValueArguments();
JetNameValidator validator = JetNameValidator.getCollectingValidator(callElement.getProject()); JetNameValidator validator = JetNameValidator.createCollectingValidator(callElement.getProject());
for (int i = 0; i < arguments.size(); i ++) { for (int i = 0; i < arguments.size(); i ++) {
ValueArgument argument = arguments.get(i); ValueArgument argument = arguments.get(i);
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class ChangeFunctionLiteralSignatureFix extends ChangeFunctionSignatureFi
runChangeSignature(project, functionDescriptor, new JetChangeSignatureConfiguration() { runChangeSignature(project, functionDescriptor, new JetChangeSignatureConfiguration() {
@Override @Override
public void configure(@NotNull JetChangeSignatureData changeSignatureData, @NotNull BindingContext bindingContext) { public void configure(@NotNull JetChangeSignatureData changeSignatureData, @NotNull BindingContext bindingContext) {
JetNameValidator validator = JetNameValidator.getCollectingValidator(project); JetNameValidator validator = JetNameValidator.createCollectingValidator(project);
changeSignatureData.clearParameters(); changeSignatureData.clearParameters();
for (JetType type : parameterTypes) { for (JetType type : parameterTypes) {
String name = JetNameSuggester.suggestNames(type, validator, "param")[0]; String name = JetNameSuggester.suggestNames(type, validator, "param")[0];
idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java
+2 -2
View File
@@ -39,8 +39,8 @@ public abstract class JetNameValidator {
}; };
} }
@NotNull //TODO: shouldn't it be "createCollectingValidator"? @NotNull
public static JetNameValidator getCollectingValidator(final Project project) { public static JetNameValidator createCollectingValidator(final Project project) {
return new JetNameValidator(project) { return new JetNameValidator(project) {
private final Set<String> suggestedSet = new HashSet<String>(); private final Set<String> suggestedSet = new HashSet<String>();