Add missing severity levels (#45)

* Add missing severity levels

* Extend linter timeout

Author: iwahbe

.golangci.yml

@@ -0,0 +1,2 @@
+run:
+  timeout: 5m

internal/cmd/compare.go

@@ -159,13 +159,13 @@ func breakingChanges(oldSchema, newSchema schema.PackageSpec) *diagtree.Node {
 			for propName, prop := range f.Inputs.Properties {
 				msg := msg.Value(propName)
 				if newFunc.Inputs == nil {
-					msg.SetDescription("missing input %q", propName)
+					msg.SetDescription(diagtree.Warn, "missing input %q", propName)
 					continue
 				}
 
 				newProp, ok := newFunc.Inputs.Properties[propName]
 				if !ok {
-					msg.SetDescription("missing input %q", propName)
+					msg.SetDescription(diagtree.Warn, "missing input %q", propName)
 					continue
 				}
 
@@ -333,7 +333,7 @@ func validateTypes(old *schema.TypeSpec, new *schema.TypeSpec, msg *diagtree.Nod
 		newType = new.Ref
 	}
 	if oldType != newType {
-		msg.SetDescription("type changed from %q to %q", oldType, newType)
+		msg.SetDescription(diagtree.Warn, "type changed from %q to %q", oldType, newType)
 	}
 
 	validateTypes(old.Items, new.Items, msg.Label("items"))

internal/util/diagtree/diagtree.go

@@ -167,10 +167,10 @@ func (m *Node) severity() string {
 	for m != nil {
 		s := m.uniqueSuccessor()
 		if s == nil {
-			if m.Severity == "" {
+			if m.Severity == None {
 				return ""
 			}
-			return string(m.Severity) + " "
+			return m.Severity.String() + " "
 		}
 		m = s
 	}
@@ -180,20 +180,23 @@ func (m *Node) severity() string {
 // The severity of a node.
 //
 // Nodes with their own (non-None) severity are always displayed on their own level.
-type Severity string
+type Severity struct{ s string }
 
-const (
-	None   Severity = ""
-	Info   Severity = "`🟢`"
-	Warn   Severity = "`🟡`"
-	Danger Severity = "`🔴`"
+var (
+	None   = Severity{""}
+	Info   = Severity{"`🟢`"}
+	Warn   = Severity{"`🟡`"}
+	Danger = Severity{"`🔴`"}
 )
 
+func (s Severity) String() string {
+	return s.s
+}
+
 func (m *Node) SetDescription(level Severity, msg string, a ...any) {
-	for v := m.parent; v != nil && !v.doDisplay; v = v.parent {
+	for v := m; v != nil && !v.doDisplay; v = v.parent {
 		v.doDisplay = true
 	}
-	m.doDisplay = true
 	m.Description = fmt.Sprintf(msg, a...)
 	m.Severity = level
 }

internal/util/diagtree/diagtree_test.go

@@ -25,9 +25,9 @@ func TestPrunedDisplay(t *testing.T) {
 	tests := []testCase{
 		{
 			input: n(func(n *diagtree.Node) {
-				n.SetDescription(diagtree.Info, "A top level value")
+				n.SetDescription(diagtree.Info, "A top level value (%d)", 1)
 			}),
-			expected:      "### `🟢` Top Level A top level value\n",
+			expected:      "### `🟢` Top Level A top level value (1)\n",
 			maxItems:      10,
 			expectedCount: 1,
 		},