Avoid panic on spelling inconsistencies errors

close #5
nihei9 · Mar 21, 2022 · f6b90c9 · f6b90c9
1 parent 1adcb17
commit f6b90c9
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 5 deletions.
diff --git a/compiler/compiler_test.go b/compiler/compiler_test.go
@@ -74,6 +74,67 @@ func TestCompile(t *testing.T) {
         }
     ]
 }
+`,
+			Err: true,
+		},
+		{
+			Caption: "don't allow kind names in the same mode to contain spelling inconsistencies",
+			Spec: `
+{
+    "name": "test",
+    "entries": [
+        {
+            "kind": "foo_1",
+            "pattern": "foo_1"
+        },
+        {
+            "kind": "foo1",
+            "pattern": "foo1"
+        }
+    ]
+}
+`,
+			Err: true,
+		},
+		{
+			Caption: "don't allow kind names across modes to contain spelling inconsistencies",
+			Spec: `
+{
+    "name": "test",
+    "entries": [
+        {
+            "modes": ["default"],
+            "kind": "foo_1",
+            "pattern": "foo_1"
+        },
+        {
+            "modes": ["other_mode"],
+            "kind": "foo1",
+            "pattern": "foo1"
+        }
+    ]
+}
+`,
+			Err: true,
+		},
+		{
+			Caption: "don't allow mode names to contain spelling inconsistencies",
+			Spec: `
+{
+    "name": "test",
+    "entries": [
+        {
+            "modes": ["foo_1"],
+            "kind": "a",
+            "pattern": "a"
+        },
+        {
+            "modes": ["foo1"],
+            "kind": "b",
+            "pattern": "b"
+        }
+    ]
+}
 `,
 			Err: true,
 		},

diff --git a/spec/spec.go b/spec/spec.go
@@ -256,18 +256,20 @@ func findSpellingInconsistenciesErrors(ids []string, hook func(ids []string) err
 
 	var errs []error
 	for _, dup := range duplicated {
-		err := hook(dup)
-		if err != nil {
-			errs = append(errs, err)
-			continue
+		if hook != nil {
+			err := hook(dup)
+			if err != nil {
+				errs = append(errs, err)
+				continue
+			}
 		}
 
 		var b strings.Builder
 		fmt.Fprintf(&b, "%+v", dup[0])
 		for _, id := range dup[1:] {
 			fmt.Fprintf(&b, ", %+v", id)
 		}
-		err = fmt.Errorf("these identifiers are treated as the same. please use the same spelling: %v", b.String())
+		err := fmt.Errorf("these identifiers are treated as the same. please use the same spelling: %v", b.String())
 		errs = append(errs, err)
 	}