Skip to content

Commit 4539825

Browse files
Formatting
1 parent ed9302d commit 4539825

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/SignatureFormatter.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,11 @@ private String formatTree(Tree tree) {
471471
} else if (tree.hasUnaryopTree()) {
472472
return formatUnaryOperation(tree.getUnaryopTree());
473473
} else if (tree.hasCastTree()) {
474-
return "(" + formatType(tree.getCastTree().getTpe()) + ")" + " " + formatTree(tree.getCastTree().getValue());
474+
return "("
475+
+ formatType(tree.getCastTree().getTpe())
476+
+ ")"
477+
+ " "
478+
+ formatTree(tree.getCastTree().getValue());
475479
}
476480

477481
throw new IllegalArgumentException("tree was of unexpected type " + tree);

semanticdb-java/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbBuilders.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ public static Semanticdb.Tree tree(Semanticdb.CastTree castTree) {
154154
return Semanticdb.Tree.newBuilder().setCastTree(castTree).build();
155155
}
156156

157-
158157
public static Semanticdb.UnaryOperatorTree unaryOpTree(
159158
Semanticdb.UnaryOperator operator, Semanticdb.Tree rhs) {
160159
return Semanticdb.UnaryOperatorTree.newBuilder().setOp(operator).setTree(rhs).build();
@@ -168,13 +167,11 @@ public static Semanticdb.AssignTree assignTree(Semanticdb.Tree lhs, Semanticdb.T
168167
return Semanticdb.AssignTree.newBuilder().setLhs(lhs).setRhs(rhs).build();
169168
}
170169

171-
public static Semanticdb.CastTree castTree(
172-
Semanticdb.Type type, Semanticdb.Tree value) {
170+
public static Semanticdb.CastTree castTree(Semanticdb.Type type, Semanticdb.Tree value) {
173171
return Semanticdb.CastTree.newBuilder().setTpe(type).setValue(value).build();
174172
}
175173
// SemanticDB Constants
176174

177-
178175
public static Semanticdb.AnnotationTree annotationTree(
179176
Semanticdb.Type type, Iterable<Semanticdb.Tree> parameters) {
180177
return Semanticdb.AnnotationTree.newBuilder().setTpe(type).addAllParameters(parameters).build();

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTrees.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,14 @@ public Semanticdb.AnnotationTree annotationBuilder(AnnotationTree annotation) {
8989
TreePath annotationTreePath = nodes.get(annotation);
9090
Element annotationSym = trees.getElement(annotationTreePath);
9191

92-
Semanticdb.Type type =
93-
typeVisitor.semanticdbType(annotationSym.asType());
92+
Semanticdb.Type type = typeVisitor.semanticdbType(annotationSym.asType());
9493
return annotationTree(type, params);
9594
}
9695

9796
private TypeMirror getTreeType(Tree tree) {
9897
TreePath path = nodes.get(tree);
9998
return trees.getTypeMirror(path);
100-
}
99+
}
101100

102101
private Semanticdb.Tree annotationParameter(ExpressionTree expr) {
103102
if (expr instanceof MemberSelectTree) {
@@ -160,14 +159,17 @@ private Semanticdb.Tree annotationParameter(ExpressionTree expr) {
160159
return annotationParameter(parenExpr.getExpression());
161160
} else if (expr instanceof TypeCastTree) {
162161
TypeCastTree tree = (TypeCastTree) expr;
163-
return tree(castTree(typeVisitor.semanticdbType(getTreeType(tree.getType())), annotationParameter(tree.getExpression())));
162+
return tree(
163+
castTree(
164+
typeVisitor.semanticdbType(getTreeType(tree.getType())),
165+
annotationParameter(tree.getExpression())));
164166
} else {
165-
throw new IllegalArgumentException(
166-
semanticdbUri
167-
+ ": annotation parameter rhs was of unexpected tree node type "
168-
+ expr.getClass()
169-
+ "\n"
170-
+ expr);
167+
throw new IllegalArgumentException(
168+
semanticdbUri
169+
+ ": annotation parameter rhs was of unexpected tree node type "
170+
+ expr.getClass()
171+
+ "\n"
172+
+ expr);
171173
}
172174
}
173175

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ void resolveNodes() {
224224
resolveMemberSelectTree((MemberSelectTree) node, entry.getValue());
225225
} else if (node instanceof NewClassTree) {
226226
resolveNewClassTree((NewClassTree) node, entry.getValue());
227-
}
227+
}
228228
}
229229
}
230230
}
@@ -338,7 +338,6 @@ private void resolveMemberSelectTree(MemberSelectTree node, TreePath treePath) {
338338
}
339339
}
340340

341-
342341
private void resolveNewClassTree(NewClassTree node, TreePath treePath) {
343342
// ignore anonymous classes - otherwise there will be a local reference to itself
344343
if (node.getIdentifier() != null && node.getClassBody() == null) {

0 commit comments

Comments
 (0)