Skip to content

Handle parenthesized trees #733

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
antonsviridov-src merged 2 commits into from
Aug 6, 2024
Merged

Handle parenthesized trees #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bac4895
Handle parenthesized trees
antonsviridov-src Aug 6, 2024
5de4367
remove comments
antonsviridov-src Aug 6, 2024
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
4 changes: 4 additions & 0 deletions semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTrees.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.sun.source.tree.LiteralTree;
import com.sun.source.tree.NewArrayTree;
import com.sun.source.tree.AnnotationTree;
import com.sun.source.tree.ParenthesizedTree;

import java.util.HashMap;
import java.util.ArrayList;
Expand Down Expand Up @@ -160,6 +161,9 @@ private Semanticdb.Tree annotationParameter(ExpressionTree expr) {
unaryOpTree(
semanticdbUnaryOperator(unaryExpr.getKind()),
annotationParameter(unaryExpr.getExpression())));
} else if (expr instanceof ParenthesizedTree) {
ParenthesizedTree parenExpr = (ParenthesizedTree) expr;
return annotationParameter(parenExpr.getExpression());
Copy link
Contributor Author

@antonsviridov-src antonsviridov-src Aug 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@olafurpg can you confirm it's fine to drill into subtree without creating intermediate semanticdb nodes?

Copy link
Contributor

@olafurpg olafurpg Aug 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine. No need to encode parentheses here, we can add it later if necessary

}
throw new IllegalArgumentException(
semanticdbUri
Expand Down
27 changes: 16 additions & 11 deletions tests/minimized/src/main/java/minimized/AnnotationParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
package minimized;


@interface Bar {
double value();
double value();
}

@interface BarB {
boolean value();
boolean value();
}

@interface Nullable {
String value() default "";
}

interface Foo {
@Bar(-1d)
double test();
@Bar(-1d)
double test();

@Bar(~5)
@SuppressWarnings(value = "unchecked")
double test2();
@Bar(~5)
@SuppressWarnings(value = "unchecked")
double test2();

@BarB(!true)
double test3();
}
@BarB(!true)
double test3();

@Nullable(("what"))
Copy link
Contributor Author

@antonsviridov-src antonsviridov-src Aug 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the new parenthesized node

Foo test4();
}
72 changes: 44 additions & 28 deletions ...hots/src/main/generated/tests/minimized/src/main/java/minimized/AnnotationParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package minimized;


@interface Bar {
// ^^^ definition semanticdb maven . . minimized/Bar#
// display_name Bar
// signature_documentation java @interface Bar
// kind Interface
// relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
double value();
→double value();
}

@interface BarB {
Expand All @@ -16,39 +15,56 @@
// signature_documentation java @interface BarB
// kind Interface
// relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
boolean value();
→boolean value();
}

@interface Nullable {
// ^^^^^^^^ definition semanticdb maven . . minimized/Nullable#
// display_name Nullable
// signature_documentation java @interface Nullable
// kind Interface
// relationship is_implementation semanticdb maven jdk 11 java/lang/annotation/Annotation#
→String value() default "";
}

interface Foo {
// ^^^ definition semanticdb maven . . minimized/Foo#
// display_name Foo
// signature_documentation java interface Foo
// kind Interface
@Bar(-1d)
// ^^^ reference semanticdb maven . . minimized/Bar#
double test();
// ^^^^ definition semanticdb maven . . minimized/Foo#test().
// display_name test
// signature_documentation java @Bar(-1.0)\npublic abstract double test()
// kind AbstractMethod
→@Bar(-1d)
//^^^ reference semanticdb maven . . minimized/Bar#
→double test();
// ^^^^ definition semanticdb maven . . minimized/Foo#test().
// display_name test
// signature_documentation java @Bar(-1.0)\npublic abstract double test()
// kind AbstractMethod

@Bar(~5)
// ^^^ reference semanticdb maven . . minimized/Bar#
@SuppressWarnings(value = "unchecked")
// ^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
// ^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#value().
double test2();
// ^^^^^ definition semanticdb maven . . minimized/Foo#test2().
// display_name test2
// signature_documentation java @Bar(~5)\n@SuppressWarnings("unchecked")\npublic abstract double test2()
// kind AbstractMethod
→@Bar(~5)
//^^^ reference semanticdb maven . . minimized/Bar#
→@SuppressWarnings(value = "unchecked")
//^^^^^^^^^^^^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#
// ^^^^^ reference semanticdb maven jdk 11 java/lang/SuppressWarnings#value().
→double test2();
// ^^^^^ definition semanticdb maven . . minimized/Foo#test2().
// display_name test2
// signature_documentation java @Bar(~5)\n@SuppressWarnings("unchecked")\npublic abstract double test2()
// kind AbstractMethod

@BarB(!true)
// ^^^^ reference semanticdb maven . . minimized/BarB#
double test3();
// ^^^^^ definition semanticdb maven . . minimized/Foo#test3().
// display_name test3
// signature_documentation java @BarB(!true)\npublic abstract double test3()
// kind AbstractMethod
}
→@BarB(!true)
//^^^^ reference semanticdb maven . . minimized/BarB#
→double test3();
// ^^^^^ definition semanticdb maven . . minimized/Foo#test3().
// display_name test3
// signature_documentation java @BarB(!true)\npublic abstract double test3()
// kind AbstractMethod

→@Nullable(("what"))
//^^^^^^^^ reference semanticdb maven . . minimized/Nullable#
→Foo test4();
//^^ reference semanticdb maven . . minimized/Foo#
// ^^^^^ definition semanticdb maven . . minimized/Foo#test4().
// display_name test4
// signature_documentation java @Nullable("what")\npublic abstract Foo test4()
// kind AbstractMethod
}