lintcmd: export fields necessary for gob encoding

Closes gh-1370

(cherry picked from commit 81b471b)

Author: dominikh

lintcmd/cmd.go

@@ -241,10 +241,10 @@ func runFromLintResult(res lintResult) run {
 		diagnostics:  map[diagnosticDescriptor]diagnostic{},
 	}
 
-	for _, cf := range res.checkedFiles {
+	for _, cf := range res.CheckedFiles {
 		out.checkedFiles[cf] = struct{}{}
 	}
-	for _, diag := range res.diagnostics {
+	for _, diag := range res.Diagnostics {
 		out.diagnostics[diag.descriptor()] = diag
 	}
 	return out
@@ -498,7 +498,7 @@ func (cmd *Command) lint() int {
 			return 1
 		}
 
-		for _, w := range res.warnings {
+		for _, w := range res.Warnings {
 			fmt.Fprintln(os.Stderr, "warning:", w)
 		}
 
@@ -518,18 +518,18 @@ func (cmd *Command) lint() int {
 		}
 
 		if cmd.flags.formatter == "binary" {
-			for i, s := range res.checkedFiles {
-				res.checkedFiles[i] = relPath(s)
+			for i, s := range res.CheckedFiles {
+				res.CheckedFiles[i] = relPath(s)
 			}
-			for i := range res.diagnostics {
+			for i := range res.Diagnostics {
 				// We turn all paths into relative, /-separated paths. This is to make -merge work correctly when
 				// merging runs from different OSs, with different absolute paths.
 				//
 				// We zero out Offset, because checkouts of code on different OSs may have different kinds of
 				// newlines and thus different offsets. We don't ever make use of the Offset, anyway. Line and
 				// column numbers are precomputed.
 
-				d := &res.diagnostics[i]
+				d := &res.Diagnostics[i]
 				d.Position.Filename = relPath(d.Position.Filename)
 				d.Position.Offset = 0
 				d.End.Filename = relPath(d.End.Filename)

lintcmd/lint.go

@@ -82,9 +82,11 @@ func newLinter(opts options) (*linter, error) {
 }
 
 type lintResult struct {
-	checkedFiles []string
-	diagnostics  []diagnostic
-	warnings     []string
+	// These fields are exported so that we can gob encode them.
+
+	CheckedFiles []string
+	Diagnostics  []diagnostic
+	Warnings     []string
 }
 
 type options struct {
@@ -148,8 +150,8 @@ func (l *linter) run(bconf buildConfig) (lintResult, error) {
 		}()
 	}
 	res, err := l.lint(r, cfg, l.opts.patterns)
-	for i := range res.diagnostics {
-		res.diagnostics[i].buildName = bconf.Name
+	for i := range res.Diagnostics {
+		res.Diagnostics[i].buildName = bconf.Name
 	}
 	return res, err
 }
@@ -185,18 +187,18 @@ func (l *linter) lint(r *runner.Runner, cfg *packages.Config, patterns []string)
 			panic("package has errors but isn't marked as failed")
 		}
 		if res.Failed {
-			out.diagnostics = append(out.diagnostics, failed(res)...)
+			out.Diagnostics = append(out.Diagnostics, failed(res)...)
 		} else {
 			if res.Skipped {
-				out.warnings = append(out.warnings, fmt.Sprintf("skipped package %s because it is too large", res.Package))
+				out.Warnings = append(out.Warnings, fmt.Sprintf("skipped package %s because it is too large", res.Package))
 				continue
 			}
 
 			if !res.Initial {
 				continue
 			}
 
-			out.checkedFiles = append(out.checkedFiles, res.Package.GoFiles...)
+			out.CheckedFiles = append(out.CheckedFiles, res.Package.GoFiles...)
 			allowedAnalyzers := filterAnalyzerNames(analyzerNames, res.Config.Checks)
 			resd, err := res.Load()
 			if err != nil {
@@ -215,7 +217,7 @@ func (l *linter) lint(r *runner.Runner, cfg *packages.Config, patterns []string)
 					filtered[i].mergeIf = a.Doc.MergeIf
 				}
 			}
-			out.diagnostics = append(out.diagnostics, filtered...)
+			out.Diagnostics = append(out.Diagnostics, filtered...)
 
 			for _, obj := range resd.Unused.Used {
 				// Note: a side-effect of this code is that fields in instantiated structs are handled correctly. Even
@@ -254,7 +256,7 @@ func (l *linter) lint(r *runner.Runner, cfg *packages.Config, patterns []string)
 		if used[uo.key] {
 			continue
 		}
-		out.diagnostics = append(out.diagnostics, diagnostic{
+		out.Diagnostics = append(out.Diagnostics, diagnostic{
 			Diagnostic: runner.Diagnostic{
 				Position: uo.obj.DisplayPosition,
 				Message:  fmt.Sprintf("%s %s is unused", uo.obj.Kind, uo.obj.Name),