Skip to content

Commit b284432

Browse files
Strum355Strum355
committed
fix pretty printing of Array signatures
1 parent f170c72 commit b284432

File tree

23 files changed

+85
-792
lines changed

23 files changed

+85
-792
lines changed

‎lsif-java/src/main/scala/com/sourcegraph/lsif_java/SemanticdbPrinters.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ object SemanticdbPrinters {
2323
.linesWithSeparators
2424
.zipWithIndex
2525
.foreach { case (line, i) =>
26-
out.append(line)
26+
out.append(line.replace("\t", "→"))
2727
val occurences = occurrencesByLine
2828
.getOrElse(i, Nil)
2929
.sortBy(o =>

‎lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/LsifSemanticdb.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private Integer processDocument(LsifTextDocument doc, Set<String> isExportedSymb
117117
ArrayList<MarkedString> markedStrings = new ArrayList<>();
118118
String documentation = symbolInformation.getDocumentation().getMessage();
119119
if (!documentation.isEmpty()) {
120-
markedStrings.add(new MarkedString(doc.semanticdb.getLanguage(), documentation));
120+
markedStrings.add(new MarkedString(Semanticdb.Language.UNKNOWN_LANGUAGE, documentation));
121121
}
122122

123123
if (symbolInformation.hasSignature()) {

‎lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public class SignatureFormatter {
1515
private static final Type WILDCARD_TYPE_REF =
1616
Type.newBuilder().setTypeRef(TypeRef.newBuilder().setSymbol("local_wildcard")).build();
1717

18+
private static final String ARRAY_SYMBOL = "scala/Array#";
19+
1820
private final StringBuilder s = new StringBuilder();
1921
private final SymbolInformation symbolInformation;
2022
private final Symtab symtab;
@@ -151,8 +153,13 @@ private String formatType(Type type) {
151153
StringBuilder b = new StringBuilder();
152154
if (type.hasTypeRef()) {
153155
TypeRef typeRef = type.getTypeRef();
154-
b.append(symbolDisplayName(typeRef.getSymbol()));
155-
b.append(formatTypeArguments(typeRef.getTypeArgumentsList()));
156+
if (typeRef.getSymbol().equals(ARRAY_SYMBOL)) {
157+
b.append(formatType(typeRef.getTypeArguments(0)));
158+
b.append("[]");
159+
} else {
160+
b.append(symbolDisplayName(typeRef.getSymbol()));
161+
b.append(formatTypeArguments(typeRef.getTypeArgumentsList()));
162+
}
156163
} else if (type.hasIntersectionType()) {
157164
b.append(
158165
type.getIntersectionType().getTypesList().stream()

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ protected void addModel(EpoxyModel<?> modelToAdd) {
219219
* inserted.
220220
*/
221221
protected void addModels(EpoxyModel<?>... modelsToAdd) {
222-
// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#addModels(). protected addModels(Array<EpoxyModel<?>> modelsToAdd)
222+
// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#addModels(). protected addModels(EpoxyModel<?>[] modelsToAdd)
223223
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
224-
// ^^^^^^^^^^^ definition local8 Array<EpoxyModel<?>> modelsToAdd
224+
// ^^^^^^^^^^^ definition local8 EpoxyModel<?>[] modelsToAdd
225225
int initialSize = models.size();
226226
// ^^^^^^^^^^^ definition local9 int initialSize
227227
// ^^^^^^ reference com/airbnb/epoxy/EpoxyAdapter#models.
@@ -501,9 +501,9 @@ protected void showModel(EpoxyModel<?> model) {
501501
* @param models The models to show. They should already be added to the {@link #models} list.
502502
*/
503503
protected void showModels(EpoxyModel<?>... models) {
504-
// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#showModels(). protected showModels(Array<EpoxyModel<?>> models)
504+
// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#showModels(). protected showModels(EpoxyModel<?>[] models)
505505
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
506-
// ^^^^^^ definition local30 Array<EpoxyModel<?>> models
506+
// ^^^^^^ definition local30 EpoxyModel<?>[] models
507507
showModels(Arrays.asList(models));
508508
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyAdapter#showModels(+2).
509509
// ^^^^^^ reference java/util/Arrays#
@@ -519,10 +519,10 @@ protected void showModels(EpoxyModel<?>... models) {
519519
* @param show True to show the models, false to hide them.
520520
*/
521521
protected void showModels(boolean show, EpoxyModel<?>... models) {
522-
// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#showModels(+1). protected showModels(boolean show, Array<EpoxyModel<?>> models)
522+
// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#showModels(+1). protected showModels(boolean show, EpoxyModel<?>[] models)
523523
// ^^^^ definition local31 boolean show
524524
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
525-
// ^^^^^^ definition local32 Array<EpoxyModel<?>> models
525+
// ^^^^^^ definition local32 EpoxyModel<?>[] models
526526
showModels(Arrays.asList(models), show);
527527
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyAdapter#showModels(+3).
528528
// ^^^^^^ reference java/util/Arrays#
@@ -605,9 +605,9 @@ protected void hideModels(Iterable<EpoxyModel<?>> models) {
605605
* @param models The models to hide. They should already be added to the {@link #models} list.
606606
*/
607607
protected void hideModels(EpoxyModel<?>... models) {
608-
// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#hideModels(+1). protected hideModels(Array<EpoxyModel<?>> models)
608+
// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#hideModels(+1). protected hideModels(EpoxyModel<?>[] models)
609609
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
610-
// ^^^^^^ definition local39 Array<EpoxyModel<?>> models
610+
// ^^^^^^ definition local39 EpoxyModel<?>[] models
611611
hideModels(Arrays.asList(models));
612612
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyAdapter#hideModels().
613613
// ^^^^^^ reference java/util/Arrays#

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ enum Option {
9999
/** Specify any {@link Option} values that should be used when generating the model class. */
100100
Option[] value() default {};
101101
//^^^^^^ reference com/airbnb/epoxy/EpoxyAttribute#Option#
102-
// ^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#value(). public abstract Array<Option> value()
102+
// ^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#value(). public abstract Option[] value()
103103

104104
/**
105105
* Whether or not to include this attribute in equals and hashCode calculations.

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -858,10 +858,10 @@ public void add(@NonNull EpoxyModel<?> model) {
858858
* EpoxyController#buildModels()}.
859859
*/
860860
protected void add(@NonNull EpoxyModel<?>... modelsToAdd) {
861-
// ^^^ definition com/airbnb/epoxy/EpoxyController#add(+1). protected add(Array<EpoxyModel<?>> modelsToAdd)
861+
// ^^^ definition com/airbnb/epoxy/EpoxyController#add(+1). protected add(EpoxyModel<?>[] modelsToAdd)
862862
// ^^^^^^^ reference androidx/annotation/NonNull#
863863
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
864-
// ^^^^^^^^^^^ definition local27 Array<EpoxyModel<?>> modelsToAdd
864+
// ^^^^^^^^^^^ definition local27 EpoxyModel<?>[] modelsToAdd
865865
modelsBeingBuilt.ensureCapacity(modelsBeingBuilt.size() + modelsToAdd.length);
866866
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#modelsBeingBuilt.
867867
// ^^^^^^^^^^^^^^ reference java/util/ArrayList#ensureCapacity().

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
/** A list of databinding layout resources that should have EpoxyModel's generated for them. */
5151
@LayoutRes int[] value();
5252
// ^^^^^^^^^ reference androidx/annotation/LayoutRes#
53-
// ^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts#value(). public abstract Array<int> value()
53+
// ^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts#value(). public abstract int[] value()
5454

5555
/**
5656
* If true, any variable whose type does not implement equals and hashcode will have the

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,10 +370,10 @@ public EpoxyModel<T> id(long id) {
370370
public EpoxyModel<T> id(@Nullable Number... ids) {
371371
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
372372
// ^ reference com/airbnb/epoxy/EpoxyModel#[T]
373-
// ^^ definition com/airbnb/epoxy/EpoxyModel#id(+2). public EpoxyModel<T> id(Array<Number> ids)
373+
// ^^ definition com/airbnb/epoxy/EpoxyModel#id(+2). public EpoxyModel<T> id(Number[] ids)
374374
// ^^^^^^^^ reference androidx/annotation/Nullable#
375375
// ^^^^^^ reference java/lang/Number#
376-
// ^^^ definition local16 Array<Number> ids
376+
// ^^^ definition local16 Number[] ids
377377
long result = 0;
378378
// ^^^^^^ definition local17 long result
379379
if (ids != null) {
@@ -458,13 +458,13 @@ public EpoxyModel<T> id(@Nullable CharSequence key) {
458458
public EpoxyModel<T> id(@Nullable CharSequence key, @Nullable CharSequence... otherKeys) {
459459
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
460460
// ^ reference com/airbnb/epoxy/EpoxyModel#[T]
461-
// ^^ definition com/airbnb/epoxy/EpoxyModel#id(+5). public EpoxyModel<T> id(CharSequence key, Array<CharSequence> otherKeys)
461+
// ^^ definition com/airbnb/epoxy/EpoxyModel#id(+5). public EpoxyModel<T> id(CharSequence key, CharSequence[] otherKeys)
462462
// ^^^^^^^^ reference androidx/annotation/Nullable#
463463
// ^^^^^^^^^^^^ reference java/lang/CharSequence#
464464
// ^^^ definition local23 CharSequence key
465465
// ^^^^^^^^ reference androidx/annotation/Nullable#
466466
// ^^^^^^^^^^^^ reference java/lang/CharSequence#
467-
// ^^^^^^^^^ definition local24 Array<CharSequence> otherKeys
467+
// ^^^^^^^^^ definition local24 CharSequence[] otherKeys
468468
long result = hashString64Bit(key);
469469
// ^^^^^^ definition local25 long result
470470
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/IdUtils#hashString64Bit().

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, Collection<? extends EpoxyModel
139139
* @param models The models that will be used to bind the views in the given layout.
140140
*/
141141
public EpoxyModelGroup(@LayoutRes int layoutRes, EpoxyModel<?>... models) {
142-
// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+1). public <init>(int layoutRes, Array<EpoxyModel<?>> models)
142+
// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+1). public <init>(int layoutRes, EpoxyModel<?>[] models)
143143
// ^^^^^^^^^ reference androidx/annotation/LayoutRes#
144144
// ^^^^^^^^^ definition local2 int layoutRes
145145
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
146-
// ^^^^^^ definition local3 Array<EpoxyModel<?>> models
146+
// ^^^^^^ definition local3 EpoxyModel<?>[] models
147147
this(layoutRes, new ArrayList<>(Arrays.asList(models)));
148148
// ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#`<init>`(+2).
149149
// ^^^^^^^^^ reference local2

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,10 +287,10 @@ public <U extends EpoxyModel> DragBuilder4<U> withTarget(Class<U> targetModelCla
287287
public DragBuilder4<EpoxyModel> withTargets(Class<? extends EpoxyModel>... targetModelClasses) {
288288
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#
289289
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
290-
// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTargets(). public DragBuilder4<EpoxyModel> withTargets(Array<Class<? extends EpoxyModel>> targetModelClasses)
290+
// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#withTargets(). public DragBuilder4<EpoxyModel> withTargets(Class<? extends EpoxyModel>[] targetModelClasses)
291291
// ^^^^^ reference java/lang/Class#
292292
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
293-
// ^^^^^^^^^^^^^^^^^^ definition local11 Array<Class<? extends EpoxyModel>> targetModelClasses
293+
// ^^^^^^^^^^^^^^^^^^ definition local11 Class<? extends EpoxyModel>[] targetModelClasses
294294
return new DragBuilder4<>(controller, recyclerView, movementFlags, EpoxyModel.class,
295295
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#`<init>`(). 1:44
296296
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#
@@ -777,11 +777,11 @@ public <U extends EpoxyModel> SwipeBuilder3<U> withTarget(Class<U> targetModelCl
777777
public SwipeBuilder3<EpoxyModel> withTargets(
778778
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#
779779
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
780-
// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTargets(). public SwipeBuilder3<EpoxyModel> withTargets(Array<Class<? extends EpoxyModel>> targetModelClasses)
780+
// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#withTargets(). public SwipeBuilder3<EpoxyModel> withTargets(Class<? extends EpoxyModel>[] targetModelClasses)
781781
Class<? extends EpoxyModel>... targetModelClasses) {
782782
// ^^^^^ reference java/lang/Class#
783783
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
784-
// ^^^^^^^^^^^^^^^^^^ definition local66 Array<Class<? extends EpoxyModel>> targetModelClasses
784+
// ^^^^^^^^^^^^^^^^^^ definition local66 Class<? extends EpoxyModel>[] targetModelClasses
785785
return new SwipeBuilder3<>(recyclerView, movementFlags, EpoxyModel.class,
786786
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#`<init>`(). 1:44
787787
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#

0 commit comments

Comments
 (0)