work both ways

Author: seungpark

snooty/parser.py

@@ -900,6 +900,15 @@ def handle_composable(self, node: n.ComposableDirective) -> None:
                     "composable-tutorial", "option_ids", "at least one", node.start[0]
                 )
             )
+            return
+
+        if len(default_ids) != len(option_ids):
+            self.diagnostics.append(
+                InvalidChildCount(
+                    "composable-tutorial", "defaults", str(len(option_ids)), node.start[0]
+                )
+            )
+            return
 
         # get the expected composable options from the spec
         spec_composables = specparser.Spec.get(
@@ -939,19 +948,7 @@ def handle_composable(self, node: n.ComposableDirective) -> None:
                     )
                     continue
                 ordered_spec_composables.append(composable_from_spec)
-                try:
-                    specified_default_id = default_ids[index]
-                except IndexError:
-                    # error to be verbose about default ids not matching up with option ids
-                    self.diagnostics.append(
-                        InvalidChildCount(
-                            "composable-tutorial",
-                            "defaults",
-                            str(len(option_ids)),
-                            node.start[0],
-                        )
-                    )
-                    continue
+                specified_default_id = default_ids[index]
                 allowed_values_dict = {
                     option.id: option for option in composable_from_spec.options
                 }

snooty/test_postprocess.py

@@ -4273,6 +4273,7 @@ def test_composable_tutorial_errors() -> None:
             MissingChild,
         ]
 
+    # below test has mismatch of options and default ids (defaults has more ids than options)
     with make_test(
         {
             Path(
@@ -4288,10 +4289,35 @@ def test_composable_tutorial_errors() -> None:
         }
     ) as result:
         diagnostics = result.diagnostics[FileId("index.txt")]
-        assert len(diagnostics) == 1
-        assert [type(d) for d in diagnostics] == [
-            InvalidChildCount,
-        ]
+        assert len(diagnostics) >= 1
+        invalidChildError = next(
+            (d for d in diagnostics if isinstance(d, InvalidChildCount)), None
+        )
+        assert invalidChildError
+        assert "defaults" in invalidChildError.message
+
+    # below test has mismatch of options and default ids (defaults has less ids than options)
+    with make_test(
+        {
+            Path(
+                "source/index.txt"
+            ): """
+.. composable-tutorial::
+   :options: interface, language, cluster-topology
+   :defaults: driver, None, repl, gcp
+
+   .. selected-content::
+      :selections: driver, None, repl, gcp
+        """
+        }
+    ) as result:
+        diagnostics = result.diagnostics[FileId("index.txt")]
+        assert len(diagnostics) >= 1
+        invalidChildError = next(
+            (d for d in diagnostics if isinstance(d, InvalidChildCount)), None
+        )
+        assert invalidChildError
+        assert "defaults" in invalidChildError.message
 
 
 def test_composable_headings() -> None: