Skip to content

hack: If the position can't be correctly created for a case statement… #19

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

Merged
raghav-deepsource merged 5 commits into from
Mar 27, 2023
Merged

hack: If the position can't be correctly created for a case statement… #19

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33e13c3
hack: If the position can't be correctly created for a case statement…
raghav-deepsource Mar 27, 2023
e5f3c8e
fix: better logging of the problem.
raghav-deepsource Mar 27, 2023
63d7426
Apply suggestions from code review
raghav-deepsource Mar 27, 2023
3e7fb74
chore: Annotate method as nullable with available annotation.
raghav-deepsource Mar 27, 2023
ea34024
fix: extra error
raghav-deepsource Mar 27, 2023
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
36 changes: 27 additions & 9 deletions src/main/java/spoon/support/compiler/jdt/PositionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package spoon.support.compiler.jdt;

import org.apache.commons.lang3.ArrayUtils;
import org.apache.maven.api.annotations.Nullable;
import org.eclipse.jdt.internal.compiler.ast.ASTNode;
import org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;
import org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;
Expand Down Expand Up @@ -54,6 +55,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;

import static spoon.support.compiler.jdt.JDTTreeBuilderQuery.getModifiers;

Expand Down Expand Up @@ -517,6 +519,7 @@ SourcePosition buildPosition(CtCatch catcher) {
lineSeparatorPositions);
}

@Nullable
SourcePosition buildPosition(CtCase<?> child) {
List<CtStatement> statements = child.getStatements();
SourcePosition oldPosition = child.getPosition();
Expand All @@ -526,15 +529,30 @@ SourcePosition buildPosition(CtCase<?> child) {
}
int[] lineSeparatorPositions = this.jdtTreeBuilder.getContextBuilder().getCompilationUnitLineSeparatorPositions();

int bodyStart = child.getPosition().getSourceEnd() + 1;
int bodyEnd = statements.get(statements.size() - 1).getPosition().getSourceEnd();
return child.getFactory().Core().createBodyHolderSourcePosition(
oldPosition.getCompilationUnit(),
oldPosition.getSourceStart(), oldPosition.getSourceEnd(),
oldPosition.getSourceStart(), oldPosition.getSourceStart() - 1,
oldPosition.getSourceStart(), bodyEnd,
bodyStart, bodyEnd,
lineSeparatorPositions);
try {

int bodyStart = child.getPosition().getSourceEnd() + 1;
int bodyEnd = statements.get(statements.size() - 1).getPosition().getSourceEnd();
return child.getFactory().Core().createBodyHolderSourcePosition(
oldPosition.getCompilationUnit(),
oldPosition.getSourceStart(), oldPosition.getSourceEnd(),
oldPosition.getSourceStart(), oldPosition.getSourceStart() - 1,
oldPosition.getSourceStart(), bodyEnd,
bodyStart, bodyEnd,
lineSeparatorPositions);
} catch (UnsupportedOperationException | SpoonException e) {
String repr = null;
try {
repr = child.toString();
} catch (Exception _ignored) {
// can't do anything.
}
Logger.getLogger(PositionBuilder.class.getName())
.severe("An error occurred while processing a case statement.\nThe statement's child looks like: "
+ repr);

return null;
}
}

/**
Expand Down