Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: fix sonarqube in JDTTreeBuilderHelper.java #2690

Merged
merged 4 commits into from
Oct 19, 2018
Merged

refactor: fix sonarqube in JDTTreeBuilderHelper.java #2690

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dd61d9
refactor: remove unused local variable - fix SonarQube
zielint0 Oct 18, 2018
df1dfa4
fix formatting
zielint0 Oct 18, 2018
106c29b
fix imports
zielint0 Oct 18, 2018
94e2308
fix doc
zielint0 Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 8 additions & 22 deletions src/main/java/spoon/support/compiler/jdt/JDTTreeBuilderHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,13 @@
import spoon.reflect.code.CtTypeAccess;
import spoon.reflect.code.CtVariableAccess;
import spoon.reflect.declaration.CtClass;
import spoon.reflect.declaration.CtConstructor;
import spoon.reflect.declaration.CtExecutable;
import spoon.reflect.declaration.CtField;
import spoon.reflect.declaration.CtModule;
import spoon.reflect.declaration.CtPackageExport;
import spoon.reflect.declaration.CtProvidedService;
import spoon.reflect.declaration.CtModuleRequirement;
import spoon.reflect.declaration.CtPackageExport;
import spoon.reflect.declaration.CtParameter;
import spoon.reflect.declaration.CtProvidedService;
import spoon.reflect.declaration.CtType;
import spoon.reflect.declaration.CtUsedService;
import spoon.reflect.declaration.CtVariable;
Expand Down Expand Up @@ -120,7 +119,7 @@ static String createQualifiedTypeName(char[][] typeName) {
* Creates a catch variable from a type reference.
*
* @param typeReference
* Correspond to the exception type declared in the catch.
* Corresponds to the exception type declared in the catch.
* @return a catch variable.
*/
CtCatchVariable<Throwable> createCatchVariable(TypeReference typeReference) {
Expand Down Expand Up @@ -174,13 +173,13 @@ <T> CtVariableAccess<T> createVariableAccess(SingleNameReference singleNameRefer
* Analyzes if {@code singleNameReference} points to a {@link CtVariable} visible in current
* scope and, if existent, returns its corresponding {@link CtVariableAccess}. Returns
* {@code null} if {@code singleNameReference} could not be resolved as variable access. Since
* we are in noclasspath mode this function may also returns {@code null} if
* we are in noclasspath mode this function may also return {@code null} if
* {@code singleNameReference} points to a variable declared by an unknown class.
*
* @param singleNameReference
* The potential variable access.
* @return A {@link CtVariableAccess} if {@code singleNameReference} points to a variable
* visible in current scope, {@code null} otherwise.
* visible in current scope, {@code null} otherwise.
*/
<T> CtVariableAccess<T> createVariableAccessNoClasspath(SingleNameReference singleNameReference) {
final CoreFactory coreFactory = jdtTreeBuilder.getFactory().Core();
Expand Down Expand Up @@ -226,20 +225,7 @@ <T> CtVariableAccess<T> createVariableAccessNoClasspath(SingleNameReference sing
// create an 'empty' type reference since we have no further information
// available
executableJDT.binding == null ? coreFactory.createTypeReference()
: referenceBuilder.getTypeReference(
executableJDT.binding.declaringClass);

// If executable is a constructor, `executable.getType()` returns null since the
// parent is not available yet. Fortunately, however, the return type of a
// constructor is its declaring class which, in our case, is already available with
// declaringReferenceOfExecutable.
CtTypeReference executableTypeReference = executable instanceof CtConstructor
// IMPORTANT: Create a clone of the type reference (rt) if retrieved by
// other AST elements as `executableFactory.createReference` (see below)
// indirectly sets the parent of `rt` and, thus, may break the AST!
? declaringReferenceOfExecutable.clone()
: executable.getType().clone();

: referenceBuilder.getTypeReference(executableJDT.binding.declaringClass);
}
variableReference = parameterReference;
variableAccess = isLhsAssignment(contextBuilder, singleNameReference)
Expand Down Expand Up @@ -298,7 +284,7 @@ <T> CtVariableAccess<T> createVariableAccess(QualifiedNameReference qualifiedNam
sourceStart = (int) (positions[qualifiedNameReference.indexOfFirstFieldBinding - 1] >>> 32);
for (FieldBinding b : qualifiedNameReference.otherBindings) {
isOtherBinding = qualifiedNameReference.otherBindings.length == i + 1;
CtFieldAccess<T> other = createFieldAccess(//
CtFieldAccess<T> other = createFieldAccess(
jdtTreeBuilder.getReferencesBuilder().<T>getVariableReference(b, qualifiedNameReference.tokens[i + 1]), va, isOtherBinding && fromAssignment);
//set source position of fa
if (i + qualifiedNameReference.indexOfFirstFieldBinding >= qualifiedNameReference.otherBindings.length) {
Expand Down Expand Up @@ -412,7 +398,7 @@ <T> CtFieldAccess<T> createFieldAccessNoClasspath(QualifiedNameReference qualifi
fieldAccess.getVariable().setDeclaringType(declaringRef);
fieldAccess.getVariable().setStatic(true);
fieldAccess.setTarget(jdtTreeBuilder.getFactory().Code().createTypeAccess(declaringRef));
// In no classpath mode and with qualified name, the binding don't have a good name.
// In no classpath mode and with qualified name, the binding doesn't have a good name.
fieldAccess.getVariable()
.setSimpleName(createQualifiedTypeName(CharOperation.subarray(qualifiedNameReference.tokens, qualifiedNameReference.tokens.length - 1, qualifiedNameReference.tokens.length)));
return fieldAccess;
Expand Down