fix(api): explicitly mark source_text optional ∵ File.text is optional (

#5666)
kythe · May 30, 2023 · c1a4536 · c1a4536
1 parent 4b56b7b
commit c1a4536
Show file tree

Hide file tree

Showing 4 changed files with 432 additions and 429 deletions.
diff --git a/kythe/go/serving/xrefs/xrefs.go b/kythe/go/serving/xrefs/xrefs.go
@@ -388,7 +388,7 @@ func (t *Table) Decorations(ctx context.Context, req *xpb.DecorationsRequest) (*
 		})
 	}
 
-	if req.SourceText {
+	if req.SourceText && text != nil {
 		reply.Encoding = decor.File.Encoding
 		if loc.Kind == xpb.Location_FILE {
 			reply.SourceText = text

diff --git a/kythe/go/serving/xrefs/xrefs_test.go b/kythe/go/serving/xrefs/xrefs_test.go
@@ -725,7 +725,7 @@ func TestDecorationsRefs(t *testing.T) {
 	})
 	testutil.Fatalf(t, "DecorationsRequest error: %v", err)
 
-	if len(reply.SourceText) != 0 {
+	if reply.SourceText != nil {
 		t.Errorf("Unexpected source text: %q", string(reply.SourceText))
 	}
 	if reply.Encoding != "" {
@@ -912,7 +912,7 @@ func TestDecorationsDirtyBuffer(t *testing.T) {
 	})
 	testutil.Fatalf(t, "DecorationsRequest error: %v", err)
 
-	if len(reply.SourceText) != 0 {
+	if reply.SourceText != nil {
 		t.Errorf("Unexpected source text: %q", string(reply.SourceText))
 	}
 	if reply.Encoding != "" {

diff --git a/kythe/proto/xref.proto b/kythe/proto/xref.proto
@@ -187,7 +187,7 @@ message DecorationsReply {
   string revision = 18;
 
   // The encoded source text for the selected window.
-  bytes source_text = 2;
+  optional bytes source_text = 2;
   string encoding = 3;
 
   // Represents a reference edge source ---KIND---> target.  Each source is an