Skip to content

Improve method start line handling by excluding Javadoc lines #124

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

Open
Deb4cker wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve method start line handling by excluding Javadoc lines #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 27 additions & 6 deletions src/main/java/com/github/mauricioaniche/ck/util/JDTUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,36 @@ public class JDTUtils {
*/

public static int getStartLine(CompilationUnit cu, MethodDeclaration node) {
return node.getBody() != null ?
cu.getLineNumber(node.getBody().getStartPosition()) :
cu.getLineNumber(node.getStartPosition());
if (node.getBody() != null) {
return cu.getLineNumber(node.getBody().getStartPosition());
}

int startPos = node.getStartPosition();

if (node.getJavadoc() != null) {
int javadocStartLine = cu.getLineNumber(node.getJavadoc().getStartPosition());
if (startPos <= javadocStartLine) {
startPos = node.getJavadoc().getStartPosition() + node.getJavadoc().getLength();
}
}

return cu.getLineNumber(startPos);
}

public static int getStartLine(CompilationUnit cu, Initializer node) {
return node.getBody() != null ?
cu.getLineNumber(node.getBody().getStartPosition()) :
cu.getLineNumber(node.getStartPosition());
if (node.getBody() != null) {
return cu.getLineNumber(node.getBody().getStartPosition());
}

int startPos = node.getStartPosition();
if (node.getJavadoc() != null) {
int javadocStartLine = cu.getLineNumber(node.getJavadoc().getStartPosition());
if (startPos <= javadocStartLine) {
startPos = node.getJavadoc().getStartPosition() + node.getJavadoc().getLength();
}
}

return cu.getLineNumber(startPos);
}

//Get the method name with parameter count and types, e.g. m1/1[int]
Expand Down