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

Replace NavigableMap<LineColumn, List<ASTNode>> to NavigableMap<LineColumn, ASTNode>, because it's impossible to have multiple elements at the very same line and column #4986

Merged
merged 1 commit into from
Feb 5, 2025
Merged

Replace NavigableMap<LineColumn, List<ASTNode>> to NavigableMap<LineColumn, ASTNode>, because it's impossible to have multiple elements at the very same line and column #4986

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
84 changes: 40 additions & 44 deletions rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ private static boolean isOlderThanGroovy3() {
}

public G.CompilationUnit visit(SourceUnit unit, ModuleNode ast) throws GroovyParsingException {
NavigableMap<LineColumn, List<ASTNode>> sortedByPosition = new TreeMap<>();
NavigableMap<LineColumn, ASTNode> sortedByPosition = new TreeMap<>();
for (org.codehaus.groovy.ast.stmt.Statement s : ast.getStatementBlock().getStatements()) {
if (!isSynthetic(s)) {
sortedByPosition.computeIfAbsent(pos(s), i -> new ArrayList<>()).add(s);
sortedByPosition.put(pos(s), s);
}
}
String shebang = null;
Expand All @@ -152,49 +152,47 @@ public G.CompilationUnit visit(SourceUnit unit, ModuleNode ast) throws GroovyPar
}

for (ImportNode anImport : ast.getImports()) {
sortedByPosition.computeIfAbsent(pos(anImport), i -> new ArrayList<>()).add(anImport);
sortedByPosition.put(pos(anImport), anImport);
}
for (ImportNode anImport : ast.getStarImports()) {
sortedByPosition.computeIfAbsent(pos(anImport), i -> new ArrayList<>()).add(anImport);
sortedByPosition.put(pos(anImport), anImport);
}
for (ImportNode anImport : ast.getStaticImports().values()) {
sortedByPosition.computeIfAbsent(pos(anImport), i -> new ArrayList<>()).add(anImport);
sortedByPosition.put(pos(anImport), anImport);
}
for (ImportNode anImport : getStaticStarImports(ast)) {
sortedByPosition.computeIfAbsent(pos(anImport), i -> new ArrayList<>()).add(anImport);
sortedByPosition.put(pos(anImport), anImport);
}

for (ClassNode aClass : ast.getClasses()) {
// skip over the synthetic script class
if (!aClass.getName().equals(ast.getMainClassName()) || !aClass.getName().endsWith("doesntmatter")) {
sortedByPosition.computeIfAbsent(pos(aClass), i -> new ArrayList<>()).add(aClass);
sortedByPosition.put(pos(aClass), aClass);
}
}

for (MethodNode method : ast.getMethods()) {
sortedByPosition.computeIfAbsent(pos(method), i -> new ArrayList<>()).add(method);
sortedByPosition.put(pos(method), method);
}

List<JRightPadded<Statement>> statements = new ArrayList<>(sortedByPosition.size());
for (Map.Entry<LineColumn, List<ASTNode>> entry : sortedByPosition.entrySet()) {
for (Map.Entry<LineColumn, ASTNode> entry : sortedByPosition.entrySet()) {
if (entry.getKey().getLine() == -1) {
// default import
continue;
}

try {
for (ASTNode value : entry.getValue()) {
if (value instanceof InnerClassNode) {
// Inner classes will be visited as part of visiting their containing class
continue;
}
JRightPadded<Statement> statement = convertTopLevelStatement(unit, value);
if (statements.isEmpty() && pkg == null && statement.getElement() instanceof J.Import) {
prefix = statement.getElement().getPrefix();
statement = statement.withElement(statement.getElement().withPrefix(EMPTY));
}
statements.add(statement);
if (entry.getValue() instanceof InnerClassNode) {
// Inner classes will be visited as part of visiting their containing class
continue;
}
JRightPadded<Statement> statement = convertTopLevelStatement(unit, entry.getValue());
if (statements.isEmpty() && pkg == null && statement.getElement() instanceof J.Import) {
prefix = statement.getElement().getPrefix();
statement = statement.withElement(statement.getElement().withPrefix(EMPTY));
}
statements.add(statement);
} catch (Throwable t) {
if (t instanceof StringIndexOutOfBoundsException) {
throw new GroovyParsingException("Failed to parse " + sourcePath + ", cursor position likely inaccurate.", t);
Expand Down Expand Up @@ -312,18 +310,18 @@ public void visitClass(ClassNode clazz) {
}

J.Block visitClassBlock(ClassNode clazz) {
NavigableMap<LineColumn, List<ASTNode>> sortedByPosition = new TreeMap<>();
NavigableMap<LineColumn, ASTNode> sortedByPosition = new TreeMap<>();
for (MethodNode method : clazz.getMethods()) {
// Most synthetic methods do not appear in source code and should be skipped entirely.
if (method.isSynthetic()) {
// Static initializer blocks show up as a synthetic method with name <clinit>
// The part that actually appears in source code is a block statement inside the method declaration
if ("<clinit>".equals(method.getName()) && method.getCode() instanceof BlockStatement && ((BlockStatement) method.getCode()).getStatements().size() == 1) {
org.codehaus.groovy.ast.stmt.Statement statement = ((BlockStatement) method.getCode()).getStatements().get(0);
sortedByPosition.computeIfAbsent(pos(statement), i -> new ArrayList<>()).add(statement);
sortedByPosition.put(pos(statement), statement);
}
} else if (method.getAnnotations(new ClassNode(Generated.class)).isEmpty()) {
sortedByPosition.computeIfAbsent(pos(method), i -> new ArrayList<>()).add(method);
sortedByPosition.put(pos(method), method);
}
}
for (org.codehaus.groovy.ast.stmt.Statement objectInitializer : clazz.getObjectInitializerStatements()) {
Expand All @@ -336,8 +334,7 @@ J.Block visitClassBlock(ClassNode clazz) {
if (s.getStatements().size() == 1 && pos(s).equals(pos(s.getStatements().get(0)))) {
s = (BlockStatement) s.getStatements().get(0);
}
sortedByPosition.computeIfAbsent(pos(s), i -> new ArrayList<>())
.add(s);
sortedByPosition.put(pos(s), s);
}
/*
In certain circumstances the same AST node may appear in multiple places.
Expand All @@ -360,42 +357,41 @@ class A {
fieldInitializers.add((InnerClassNode) cce.getType());
}
}
sortedByPosition.computeIfAbsent(pos(field), i -> new ArrayList<>()).add(field);
sortedByPosition.put(pos(field), field);
}
for (ConstructorNode ctor : clazz.getDeclaredConstructors()) {
if (!appearsInSource(ctor)) {
continue;
}
sortedByPosition.computeIfAbsent(pos(ctor), i -> new ArrayList<>()).add(ctor);
sortedByPosition.put(pos(ctor), ctor);
}
Iterator<InnerClassNode> innerClassIterator = clazz.getInnerClasses();
while (innerClassIterator.hasNext()) {
InnerClassNode icn = innerClassIterator.next();
if (icn.isSynthetic() || fieldInitializers.contains(icn)) {
continue;
}
sortedByPosition.computeIfAbsent(pos(icn), i -> new ArrayList<>()).add(icn);
sortedByPosition.put(pos(icn), icn);
}

return new J.Block(randomId(), sourceBefore("{"), Markers.EMPTY,
JRightPadded.build(false),
sortedByPosition.values().stream()
.flatMap(asts -> asts.stream()
// anonymous classes will be visited as part of visiting the ConstructorCallExpression
.filter(ast -> !(ast instanceof InnerClassNode && ((InnerClassNode) ast).isAnonymous()))
.map(ast -> {
if (ast instanceof FieldNode) {
visitField((FieldNode) ast);
} else if (ast instanceof MethodNode) {
visitMethod((MethodNode) ast);
} else if (ast instanceof ClassNode) {
visitClass((ClassNode) ast);
} else if (ast instanceof BlockStatement) {
visitBlockStatement((BlockStatement) ast);
}
Statement stat = pollQueue();
return maybeSemicolon(stat);
}))
// anonymous classes will be visited as part of visiting the ConstructorCallExpression
.filter(ast -> !(ast instanceof InnerClassNode && ((InnerClassNode) ast).isAnonymous()))
.map(ast -> {
if (ast instanceof FieldNode) {
visitField((FieldNode) ast);
} else if (ast instanceof MethodNode) {
visitMethod((MethodNode) ast);
} else if (ast instanceof ClassNode) {
visitClass((ClassNode) ast);
} else if (ast instanceof BlockStatement) {
visitBlockStatement((BlockStatement) ast);
}
Statement stat = pollQueue();
return maybeSemicolon(stat);
})
.collect(toList()),
sourceBefore("}"));
}
Expand Down