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

DeprecatedSymbolUsageFix: more correct generation of "let" for safe call

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-18 20:41:56 +03:00
parent df850d7035
commit 348d09866a
11 changed files with 203 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/refactoring/JetNameSuggester.java
+7 -3
View File
@@ -45,11 +45,10 @@ public class JetNameSuggester {
}
private static void addName(ArrayList<String> result, @Nullable String name, JetNameValidator validator) {
if (name == null) return;
if ("class".equals(name)) name = "clazz";
if (!isIdentifier(name)) return;
String newName = validator.validateName(name);
if (newName == null) return;
result.add(newName);
result.add(validator.validateName(name));
}
/**
@@ -93,8 +92,13 @@ public class JetNameSuggester {
}
public static @NotNull String[] suggestNamesForExpression(@NotNull JetExpression expression, @NotNull JetNameValidator validator) {
return suggestNamesForExpression(expression, validator, null);
}
public static @NotNull String[] suggestNamesForExpression(@NotNull JetExpression expression, @NotNull JetNameValidator validator, @Nullable String defaultName) {
ArrayList<String> result = new ArrayList<String>();
addNamesForExpression(result, expression, validator);
if (result.isEmpty()) addName(result, defaultName, validator);
return ArrayUtil.toStringArray(result);
}