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

Replaced if-else-if chain with visitor.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-09-17 14:04:36 +04:00
parent a0ffb0d979
commit 572b58012c
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java
+28 -23
View File
@@ -189,31 +189,36 @@ public class JetNameSuggester {
return matcher.replaceAll("");
}
private static void addNamesForExpression(ArrayList<String> result, JetExpression expression, JetNameValidator validator) {
if (expression instanceof JetQualifiedExpression) {
JetQualifiedExpression qualifiedExpression = (JetQualifiedExpression) expression;
JetExpression selectorExpression = qualifiedExpression.getSelectorExpression();
addNamesForExpression(result, selectorExpression, validator);
}
else if (expression instanceof JetSimpleNameExpression) {
JetSimpleNameExpression reference = (JetSimpleNameExpression) expression;
String referenceName = reference.getReferencedName();
if (referenceName == null) return;
if (referenceName.equals(referenceName.toUpperCase())) {
addName(result, referenceName, validator);
private static void addNamesForExpression(final ArrayList<String> result, JetExpression expression, final JetNameValidator validator) {
expression.accept(new JetVisitorVoid() {
@Override
public void visitQualifiedExpression(JetQualifiedExpression expression) {
JetExpression selectorExpression = expression.getSelectorExpression();
addNamesForExpression(result, selectorExpression, validator);
}
else {
addCamelNames(result, referenceName, validator);
@Override
public void visitSimpleNameExpression(JetSimpleNameExpression expression) {
String referenceName = expression.getReferencedName();
if (referenceName == null) return;
if (referenceName.equals(referenceName.toUpperCase())) {
addName(result, referenceName, validator);
}
else {
addCamelNames(result, referenceName, validator);
}
}
}
else if (expression instanceof JetCallExpression) {
JetCallExpression call = (JetCallExpression) expression;
addNamesForExpression(result, call.getCalleeExpression(), validator);
}
else if (expression instanceof JetPostfixExpression) {
JetPostfixExpression postfixExpression = (JetPostfixExpression) expression;
addNamesForExpression(result, postfixExpression.getBaseExpression(), validator);
}
@Override
public void visitCallExpression(JetCallExpression expression) {
addNamesForExpression(result, expression.getCalleeExpression(), validator);
}
@Override
public void visitPostfixExpression(JetPostfixExpression expression) {
addNamesForExpression(result, expression.getBaseExpression(), validator);
}
});
}
public static boolean isIdentifier(String name) {