go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hcl: Deduplicate symbols when printing diagnostic messages

Browse Source
This commit is contained in:
Martin Atkins 2018-07-28 15:44:15 -07:00
parent 8dd89ebbb3
commit f6fe9b5c69
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hcl/diagnostic_text.go
View File

@ -147,6 +147,7 @@ func (w *diagnosticTextWriter) WriteDiagnostic(diag *Diagnostic) error {
vars := expr.Variables() vars := expr.Variables()
stmts := make([]string, 0, len(vars)) stmts := make([]string, 0, len(vars))
seen := make(map[string]struct{}, len(vars))
for _, traversal := range vars { for _, traversal := range vars {
val, diags := traversal.TraverseAbs(ctx) val, diags := traversal.TraverseAbs(ctx)
if diags.HasErrors() { if diags.HasErrors() {
@ -157,6 +158,9 @@ func (w *diagnosticTextWriter) WriteDiagnostic(diag *Diagnostic) error {
} }
traversalStr := w.traversalStr(traversal) traversalStr := w.traversalStr(traversal)
if _, exists := seen[traversalStr]; exists {
continue // don't show duplicates when the same variable is referenced multiple times
}
switch { switch {
case !val.IsKnown(): case !val.IsKnown():
// Can't say anything about this yet, then. // Can't say anything about this yet, then.
@ -166,6 +170,7 @@ func (w *diagnosticTextWriter) WriteDiagnostic(diag *Diagnostic) error {
default: default:
stmts = append(stmts, fmt.Sprintf("%s as %s", traversalStr, w.valueStr(val))) stmts = append(stmts, fmt.Sprintf("%s as %s", traversalStr, w.valueStr(val)))
} }
seen[traversalStr] = struct{}{}
} }
sort.Strings(stmts) // FIXME: Should maybe use a traversal-aware sort that can sort numeric indexes properly? sort.Strings(stmts) // FIXME: Should maybe use a traversal-aware sort that can sort numeric indexes properly?