Skip to content

Handle null/unit constant types. #300

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
merged 1 commit into from
Aug 11, 2021
+14 −2
Merged

Handle null/unit constant types. #300

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
6 changes: 5 additions & 1 deletion lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,9 @@ private String formatTree(Tree tree) {
}

private String formatConstant(Constant constant) {
if (constant.hasBooleanConstant()) {
if (constant.hasUnitConstant()) {
return isScala ? "()" : "scala.Unit()";
} else if (constant.hasBooleanConstant()) {
return Boolean.toString(constant.getBooleanConstant().getValue());
} else if (constant.hasByteConstant()) {
return Integer.toString(constant.getByteConstant().getValue());
Expand All @@ -490,6 +492,8 @@ private String formatConstant(Constant constant) {
return Double.toString(constant.getDoubleConstant().getValue());
} else if (constant.hasStringConstant()) {
return '"' + constant.getStringConstant().getValue() + '"';
} else if (constant.hasNullConstant()) {
return "null";
}
throw new IllegalArgumentException("constant was not of known type " + constant);
}
Expand Down
10 changes: 9 additions & 1 deletion semanticdb-java/src/main/protobuf/semanticdb.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ enum BinaryOperator {

message Constant {
oneof sealed_value {
UnitConstant unit_constant = 1;
BooleanConstant boolean_constant = 2;
ByteConstant byte_constant = 3;
ShortConstant short_constant = 4;
Expand All @@ -355,9 +356,13 @@ message Constant {
FloatConstant float_constant = 8;
DoubleConstant double_constant = 9;
StringConstant string_constant = 10;
NullConstant null_constant = 11;
}
}

message UnitConstant {
}

message BooleanConstant {
bool value = 1;
}
Expand Down Expand Up @@ -392,4 +397,7 @@ message DoubleConstant {

message StringConstant {
string value = 1;
}
}

message NullConstant {
}