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

Create from usage: Extracted method from getNextAvailableName.

Browse Source
This commit is contained in:
Jack Zhou
2013-05-28 16:57:26 -07:00
parent 12aa90f564
commit a91a2efc75
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java
+6 -2
View File
@@ -1128,14 +1128,18 @@ public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase {
*/ */
@NotNull @NotNull
private static String getNextAvailableName(@NotNull String name, @NotNull Collection<String> existingNames, @Nullable JetScope scope) { private static String getNextAvailableName(@NotNull String name, @NotNull Collection<String> existingNames, @Nullable JetScope scope) {
if (existingNames.contains(name) || (scope != null && scope.getClassifier(Name.identifier(name)) != null)) { if (isConflictingName(name, existingNames, scope)) {
int j = 1; int j = 1;
while (existingNames.contains(name + j) || (scope != null && scope.getClassifier(Name.identifier(name + j)) != null)) j++; while (isConflictingName(name + j, existingNames, scope)) j++;
name += j; name += j;
} }
return name; return name;
} }
private static boolean isConflictingName(@NotNull String name, @NotNull Collection<String> existingNames, @Nullable JetScope scope) {
return existingNames.contains(name) || (scope != null && scope.getClassifier(Name.identifier(name)) != null);
}
@NotNull @NotNull
private static JetType[] guessTypesForExpression(@NotNull JetExpression expr, @NotNull BindingContext context) { private static JetType[] guessTypesForExpression(@NotNull JetExpression expr, @NotNull BindingContext context) {
JetType type = context.get(BindingContext.EXPRESSION_TYPE, expr); JetType type = context.get(BindingContext.EXPRESSION_TYPE, expr);