search: rename result type fields consistently (#610)

Author: rvantonder

cmd/src/search_stream_test.go

@@ -42,7 +42,7 @@ var event = []streaming.EventMatch{
 		Path:       "path/to/file",
 		Repository: "org/repo",
 		Branches:   nil,
-		Version:    "",
+		Commit:     "",
 		LineMatches: []streaming.EventLineMatch{
 			{
 				Line:             "foo bar foo",
@@ -61,7 +61,7 @@ var event = []streaming.EventMatch{
 		Path:       "path/to/file",
 		Repository: "org/repo",
 		Branches:   []string{},
-		Version:    "",
+		Commit:     "",
 		Symbols: []streaming.Symbol{
 			{
 				URL:           "github.com/sourcegraph/sourcegraph/-/blob/cmd/frontend/graphqlbackend/search_results.go#L1591:26-1591:35",

cmd/src/testdata/streaming_search_want.json

@@ -1,5 +1,5 @@
-{"type":"content","name":"path/to/file","repository":"org/repo","lineMatches":[{"line":"foo bar foo","lineNumber":4,"offsetAndLengths":[[0,3],[8,3]]}]}
+{"type":"content","path":"path/to/file","repository":"org/repo","lineMatches":[{"line":"foo bar foo","lineNumber":4,"offsetAndLengths":[[0,3],[8,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":"symbol","path":"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]]}
 {"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":"```diff\nsrc/data.ts src/data.ts\n@@ -0,0 +11,4 @@\n+    return of\u003cData\u003e({\n+        title: 'Acme Corp open-source code search',\n+        summary: 'Instant code search across all Acme Corp open-source code.',\n+        githubOrgs: ['sourcegraph'],\n```","ranges":[[4,44,6]]}

internal/streaming/events.go

@@ -17,10 +17,10 @@ type EventContentMatch struct {
 	// Type is always ContentMatchType. Included here for marshalling.
 	Type MatchType `json:"type"`
 
-	Path       string   `json:"name"`
+	Path       string   `json:"path"`
 	Repository string   `json:"repository"`
 	Branches   []string `json:"branches,omitempty"`
-	Version    string   `json:"version,omitempty"`
+	Commit     string   `json:"commit,omitempty"`
 
 	LineMatches []EventLineMatch `json:"lineMatches"`
 }
@@ -32,10 +32,10 @@ type EventPathMatch struct {
 	// Type is always PathMatchType. Included here for marshalling.
 	Type MatchType `json:"type"`
 
-	Path       string   `json:"name"`
+	Path       string   `json:"path"`
 	Repository string   `json:"repository"`
 	Branches   []string `json:"branches,omitempty"`
-	Version    string   `json:"version,omitempty"`
+	Commit     string   `json:"commit,omitempty"`
 }
 
 func (e *EventPathMatch) eventMatch() {}
@@ -63,10 +63,10 @@ type EventSymbolMatch struct {
 	// Type is always SymbolMatchType. Included here for marshalling.
 	Type MatchType `json:"type"`
 
-	Path       string   `json:"name"`
+	Path       string   `json:"path"`
 	Repository string   `json:"repository"`
 	Branches   []string `json:"branches,omitempty"`
-	Version    string   `json:"version,omitempty"`
+	Commit     string   `json:"commit,omitempty"`
 
 	Symbols []Symbol `json:"symbols"`
 }