Skip to content
This repository was archived by the owner on Mar 12, 2025. It is now read-only.

Update JavaParser to 3.13.4 #1

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

Update JavaParser to 3.13.4 #1

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sourceSets {


dependencies {
compile group: 'com.github.javaparser', name: 'javaparser-core', version: '3.8.3'
compile group: 'com.github.javaparser', name: 'javaparser-core', version: '3.13.4'
compile 'org.bitbucket.mstrobel:procyon-compilertools:0.5.33.6'
compile "org.ow2.asm:asm:7.0"
compile "org.ow2.asm:asm-commons:7.0"
Expand Down
58 changes: 41 additions & 17 deletions src/matcher/srcprocess/HtmlPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr;
import com.github.javaparser.ast.expr.StringLiteralExpr;
import com.github.javaparser.ast.expr.SuperExpr;
import com.github.javaparser.ast.expr.SwitchExpr;
import com.github.javaparser.ast.expr.ThisExpr;
import com.github.javaparser.ast.expr.TypeExpr;
import com.github.javaparser.ast.expr.UnaryExpr;
Expand All @@ -85,6 +86,7 @@
import com.github.javaparser.ast.nodeTypes.NodeWithTraversableScope;
import com.github.javaparser.ast.nodeTypes.NodeWithTypeArguments;
import com.github.javaparser.ast.nodeTypes.NodeWithVariables;
import com.github.javaparser.ast.nodeTypes.SwitchNode;
import com.github.javaparser.ast.stmt.AssertStmt;
import com.github.javaparser.ast.stmt.BlockStmt;
import com.github.javaparser.ast.stmt.BreakStmt;
Expand All @@ -101,7 +103,7 @@
import com.github.javaparser.ast.stmt.LocalClassDeclarationStmt;
import com.github.javaparser.ast.stmt.ReturnStmt;
import com.github.javaparser.ast.stmt.Statement;
import com.github.javaparser.ast.stmt.SwitchEntryStmt;
import com.github.javaparser.ast.stmt.SwitchEntry;
import com.github.javaparser.ast.stmt.SwitchStmt;
import com.github.javaparser.ast.stmt.SynchronizedStmt;
import com.github.javaparser.ast.stmt.ThrowStmt;
Expand Down Expand Up @@ -146,10 +148,10 @@ public String getSource() {
return printer.getSource();
}

private void printModifiers(final EnumSet<Modifier> modifiers) {
private void printModifiers(final NodeList<Modifier> modifiers) {
for (Modifier m : modifiers) {
printer.print("<span class=\"keyword\">");
printer.print(m.asString());
printer.print(m.getKeyword().asString());
printer.print("</span> ");
}
}
Expand All @@ -160,9 +162,9 @@ private void printMembers(final NodeList<BodyDeclaration<?>> members, final Void
.comparingInt(HtmlPrinter::getTypeIdx)
.thenComparing((a, b) -> {
// move instance methods after constructors
if (a.isConstructorDeclaration() && b.isMethodDeclaration() && !((MethodDeclaration) b).getModifiers().contains(Modifier.STATIC)) {
if (a.isConstructorDeclaration() && b.isMethodDeclaration() && !((MethodDeclaration) b).getModifiers().contains(Modifier.Keyword.STATIC)) {
return -1;
} else if (b.isConstructorDeclaration() && a.isMethodDeclaration() && !((MethodDeclaration) a).getModifiers().contains(Modifier.STATIC)) {
} else if (b.isConstructorDeclaration() && a.isMethodDeclaration() && !((MethodDeclaration) a).getModifiers().contains(Modifier.Keyword.STATIC)) {
return 1;
} else {
return 0;
Expand All @@ -175,7 +177,7 @@ private void printMembers(final NodeList<BodyDeclaration<?>> members, final Void
if (prev != null &&
(!prev.isFieldDeclaration()
|| !member.isFieldDeclaration()
|| ((FieldDeclaration) prev).getModifiers().contains(Modifier.STATIC) && !((FieldDeclaration) member).getModifiers().contains(Modifier.STATIC))) {
|| ((FieldDeclaration) prev).getModifiers().contains(Modifier.Keyword.STATIC) && !((FieldDeclaration) member).getModifiers().contains(Modifier.Keyword.STATIC))) {
printer.println();
}

Expand All @@ -195,7 +197,7 @@ private static int getTypeIdx(BodyDeclaration<?> decl) {
} else if (decl.isAnnotationMemberDeclaration() || decl.isCallableDeclaration()) {
return 1;
} else if (decl.isFieldDeclaration()) {
return ((FieldDeclaration) decl).getModifiers().contains(Modifier.STATIC) ? 2 : 3;
return ((FieldDeclaration) decl).getModifiers().contains(Modifier.Keyword.STATIC) ? 2 : 3;
} else if (decl.isInitializerDeclaration()) {
return ((InitializerDeclaration) decl).isStatic() ? 2 : 3;
} else if (decl.isTypeDeclaration()) {
Expand Down Expand Up @@ -377,7 +379,6 @@ public void visit(final Name n, final Void arg) {
n.getQualifier().get().accept(this, arg);
printer.print(".");
}
printAnnotations(n.getAnnotations(), false, arg);
printer.print(n.getIdentifier());

printOrphanCommentsEnding(n);
Expand Down Expand Up @@ -1267,33 +1268,48 @@ public void visit(final ExpressionStmt n, final Void arg) {
printer.print(";");
}

@Override
public void visit(final SwitchExpr n, final Void arg) {
printSwitchNode(n, arg);
}

@Override
public void visit(final SwitchStmt n, final Void arg) {
if (canAddNewLine(n)) printer.println();
printSwitchNode(n, arg);
}

private void printSwitchNode(final SwitchNode n, final Void arg) {
if (canAddNewLine((Node)n)) printer.println();

printComment(n.getComment(), arg);
printer.print("<span class=\"keyword\">switch</span> (");
n.getSelector().accept(this, arg);
printer.println(") {");
if (n.getEntries() != null) {
for (final SwitchEntryStmt e : n.getEntries()) {
for (final SwitchEntry e : n.getEntries()) {
e.accept(this, arg);
}
}
printer.print("}");

if (getNext(n) != null) printer.println();
if (getNext((Node)n) != null) printer.println();
}

@Override
public void visit(final SwitchEntryStmt n, final Void arg) {
public void visit(final SwitchEntry n, final Void arg) {
printComment(n.getComment(), arg);
if (n.getLabel().isPresent()) {
if (isNullOrEmpty(n.getLabels())) {
printer.print("<span class=\"keyword\">default</span>:");
} else {
printer.print("<span class=\"keyword\">case</span> ");
n.getLabel().get().accept(this, arg);
for (final Iterator<Expression> i = n.getLabels().iterator(); i.hasNext(); ) {
final Expression label = i.next();
label.accept(this, arg);
if (i.hasNext()) {
printer.print(", ");
}
}
printer.print(":");
} else {
printer.print("<span class=\"keyword\">default</span>:");
}

if (n.getStatements() != null
Expand Down Expand Up @@ -1322,7 +1338,7 @@ public void visit(final SwitchEntryStmt n, final Void arg) {
public void visit(final BreakStmt n, final Void arg) {
printComment(n.getComment(), arg);
printer.print("<span class=\"keyword\">break</span>");
n.getLabel().ifPresent(l -> printer.print(" ").print(l.getIdentifier()));
n.getValue().ifPresent(l -> l.accept(this, arg));
printer.print(";");
}

Expand Down Expand Up @@ -1677,6 +1693,14 @@ public void visit(final MarkerAnnotationExpr n, final Void arg) {
printer.print("</span>");
}

@Override
public void visit(final Modifier n, final Void arg) {
printComment(n.getComment(), arg);
printer.print("<span class=\"keyword\">");
printer.print(n.getKeyword().asString());
printer.print("</span>");
}

@Override
public void visit(final SingleMemberAnnotationExpr n, final Void arg) {
printComment(n.getComment(), arg);
Expand Down
4 changes: 2 additions & 2 deletions src/matcher/srcprocess/SrcDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;

import com.github.javaparser.JavaParser;
import com.github.javaparser.StaticJavaParser;
import com.github.javaparser.ParseProblemException;
import com.github.javaparser.ast.CompilationUnit;
import com.github.javaparser.ast.Node;
Expand Down Expand Up @@ -54,7 +54,7 @@ public static String decorate(String src, ClassInstance cls, NameType nameType)
CompilationUnit cu;

try {
cu = JavaParser.parse(src);
cu = StaticJavaParser.parse(src);
} catch (ParseProblemException e) {
throw new SrcParseException(src, e);
}
Expand Down