rename File events to Content events (#569)

This commit renames references to file events to content events in order
to match the changes made in the stream API.

Author: camdencheek

cmd/src/search_stream.go

@@ -133,13 +133,13 @@ func textDecoder(query string, t *template.Template, w io.Writer) streaming.Deco
 		OnMatches: func(matches []streaming.EventMatch) {
 			for _, match := range matches {
 				switch match := match.(type) {
-				case *streaming.EventFileMatch:
-					err := t.ExecuteTemplate(w, "file", struct {
+				case *streaming.EventContentMatch:
+					err := t.ExecuteTemplate(w, "content", struct {
 						Query string
-						*streaming.EventFileMatch
+						*streaming.EventContentMatch
 					}{
-						Query:          query,
-						EventFileMatch: match,
+						Query:             query,
+						EventContentMatch: match,
 					},
 					)
 					if err != nil {
@@ -225,7 +225,7 @@ const streamingTemplate = `
 	{{- "\n" -}}
 {{- end -}}
 
-{{define "file"}}
+{{define "content"}}
 	{{- /* Repository and file name */ -}}
 	{{- color "search-repository"}}{{.Repository}}{{color "nc" -}}
 	{{- " › " -}}

cmd/src/search_stream_test.go

@@ -37,8 +37,8 @@ func testServer(t *testing.T, handler http.Handler) *httptest.Server {
 }
 
 var event = []streaming.EventMatch{
-	&streaming.EventFileMatch{
-		Type:       streaming.FileMatchType,
+	&streaming.EventContentMatch{
+		Type:       streaming.ContentMatchType,
 		Path:       "path/to/file",
 		Repository: "org/repo",
 		Branches:   nil,

cmd/src/testdata/streaming_search_want.json

@@ -1,4 +1,4 @@
-{"type":"file","name":"path/to/file","repository":"org/repo","lineMatches":[{"line":"foo bar","lineNumber":4,"offsetAndLengths":[[4,3]]}]}
+{"type":"content","name":"path/to/file","repository":"org/repo","lineMatches":[{"line":"foo bar","lineNumber":4,"offsetAndLengths":[[4,3]]}]}
 {"type":"repo","repository":"sourcegraph/sourcegraph"}
 {"type":"symbol","name":"path/to/file","repository":"org/repo","symbols":[{"url":"github.com/sourcegraph/sourcegraph/-/blob/cmd/frontend/graphqlbackend/search_results.go#L1591:26-1591:35","name":"doResults","containerName":"","kind":"FUNCTION"},{"url":"github.com/sourcegraph/sourcegraph/-/blob/cmd/frontend/graphqlbackend/search_results.go#L1591:26-1591:35","name":"Results","containerName":"SearchResultsResolver","kind":"FIELD"}]}
 {"type":"commit","icon":"","label":"[sourcegraph/sourcegraph-atom](/github.com/sourcegraph/sourcegraph-atom) › [Stephen Gutekanst](/github.com/sourcegraph/sourcegraph-atom/-/commit/5b098d7fed963d88e23057ed99d73d3c7a33ad89): [all: release v1.0.5](/github.com/sourcegraph/sourcegraph-atom/-/commit/5b098d7fed963d88e23057ed99d73d3c7a33ad89)^","url":"","detail":"","content":"```COMMIT_EDITMSG\nfoo bar\n```","ranges":[[1,3,3]]}

internal/streaming/client.go

@@ -158,8 +158,8 @@ func (r *eventMatchUnmarshaller) UnmarshalJSON(b []byte) error {
 	}
 
 	switch typeU.Type {
-	case FileMatchType:
-		r.EventMatch = &EventFileMatch{}
+	case ContentMatchType:
+		r.EventMatch = &EventContentMatch{}
 	case RepoMatchType:
 		r.EventMatch = &EventRepoMatch{}
 	case SymbolMatchType:

internal/streaming/client_test.go

@@ -27,8 +27,8 @@ func TestDecoder(t *testing.T) {
 	}, {
 		Name: "matches",
 		Value: []EventMatch{
-			&EventFileMatch{
-				Type: FileMatchType,
+			&EventContentMatch{
+				Type: ContentMatchType,
 				Path: "test",
 			},
 			&EventRepoMatch{

internal/streaming/events.go

@@ -12,9 +12,9 @@ type EventMatch interface {
 	eventMatch()
 }
 
-// EventFileMatch is a subset of zoekt.FileMatch for our Event API.
-type EventFileMatch struct {
-	// Type is always FileMatchType. Included here for marshalling.
+// EventContentMatch is a subset of zoekt.FileMatch for our Event API.
+type EventContentMatch struct {
+	// Type is always ContentMatchType. Included here for marshalling.
 	Type MatchType `json:"type"`
 
 	Path       string   `json:"name"`
@@ -25,7 +25,7 @@ type EventFileMatch struct {
 	LineMatches []EventLineMatch `json:"lineMatches"`
 }
 
-func (e *EventFileMatch) eventMatch() {}
+func (e *EventContentMatch) eventMatch() {}
 
 // EventPathMatch is a subset of zoekt.FileMatch for our Event API.
 type EventPathMatch struct {
@@ -132,7 +132,7 @@ type EventError struct {
 type MatchType int
 
 const (
-	FileMatchType MatchType = iota
+	ContentMatchType MatchType = iota
 	RepoMatchType
 	SymbolMatchType
 	CommitMatchType
@@ -141,8 +141,8 @@ const (
 
 func (t MatchType) MarshalJSON() ([]byte, error) {
 	switch t {
-	case FileMatchType:
-		return []byte(`"file"`), nil
+	case ContentMatchType:
+		return []byte(`"content"`), nil
 	case RepoMatchType:
 		return []byte(`"repo"`), nil
 	case SymbolMatchType:
@@ -158,8 +158,8 @@ func (t MatchType) MarshalJSON() ([]byte, error) {
 }
 
 func (t *MatchType) UnmarshalJSON(b []byte) error {
-	if bytes.Equal(b, []byte(`"file"`)) {
-		*t = FileMatchType
+	if bytes.Equal(b, []byte(`"content"`)) {
+		*t = ContentMatchType
 	} else if bytes.Equal(b, []byte(`"repo"`)) {
 		*t = RepoMatchType
 	} else if bytes.Equal(b, []byte(`"symbol"`)) {