Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small refactoring, removed duplicated code

Browse Source
This commit is contained in:
Martin Lippert
2019-05-03 09:58:33 +02:00
parent 4317b1e663
commit 93caf59fe0
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ASTUtils.java
View File

@@ -25,6 +25,7 @@ import org.eclipse.jdt.core.dom.ITypeBinding;
import org.eclipse.jdt.core.dom.IVariableBinding;
import org.eclipse.jdt.core.dom.MemberValuePair;
import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.core.dom.Name;
import org.eclipse.jdt.core.dom.NormalAnnotation;
import org.eclipse.jdt.core.dom.QualifiedName;
import org.eclipse.jdt.core.dom.SimpleName;
@@ -181,8 +182,8 @@ public class ASTUtils {
public static String getExpressionValueAsString(Expression exp) {
if (exp instanceof StringLiteral) {
return getLiteralValue((StringLiteral) exp);
} else if (exp instanceof QualifiedName) {
IBinding binding = ((QualifiedName) exp).resolveBinding();
} else if (exp instanceof Name) {
IBinding binding = ((Name) exp).resolveBinding();
if (binding != null && binding.getKind() == IBinding.VARIABLE) {
IVariableBinding varBinding = (IVariableBinding) binding;
Object constValue = varBinding.getConstantValue();
@@ -190,17 +191,15 @@ public class ASTUtils {
return constValue.toString();
}
}
return getExpressionValueAsString(((QualifiedName) exp).getName());
} else if (exp instanceof SimpleName) {
IBinding binding = ((SimpleName) exp).resolveBinding();
if (binding != null && binding.getKind() == IBinding.VARIABLE) {
IVariableBinding varBinding = (IVariableBinding) binding;
Object constValue = varBinding.getConstantValue();
if (constValue != null) {
return constValue.toString();
}
if (exp instanceof QualifiedName) {
return getExpressionValueAsString(((QualifiedName) exp).getName());
}
else if (exp instanceof SimpleName) {
return ((SimpleName) exp).getIdentifier();
}
else {
return null;
}
return ((SimpleName) exp).getIdentifier();
} else {
return null;
}