Merge branch 'main' into 53-git-root-config-option

Author: patdhlk

.gitignore

@@ -23,3 +23,4 @@ uv.lock
 # coverage files
 .coverage
 coverage.xml
+invalid_objs.json

src/sphinx_codelinks/analyse/analyse.py

@@ -202,15 +202,15 @@ def extract_oneline_need(
                 if not src_comment.source_file:
                     row_offset += 1
                     continue
-                self.oneline_warnings.append(
-                    AnalyseWarning(
-                        str(src_comment.source_file.filepath),
-                        src_comment.node.start_point.row + row_offset + 1,
-                        resolved.msg,
-                        MarkedContentType.need,
-                        resolved.sub_type.value,
-                    )
+                lineno = src_comment.node.start_point.row + row_offset + 1
+                warning = AnalyseWarning(
+                    str(src_comment.source_file.filepath),
+                    lineno,
+                    resolved.msg,
+                    MarkedContentType.need,
+                    resolved.sub_type.value,
                 )
+                self.oneline_warnings.append(warning)
                 row_offset += 1
                 continue
             yield resolved, row_offset

src/sphinx_codelinks/cmd.py

@@ -157,6 +157,15 @@ def analyse(  # noqa: PLR0912   # for CLI, so it needs the branches
     codelinks_config.projects = specifed_project_configs
     analyse_projects = AnalyseProjects(codelinks_config)
     analyse_projects.run()
+
+    # Output warnings to console for CLI users
+    for src_analyse in analyse_projects.projects_analyse.values():
+        for warning in src_analyse.oneline_warnings:
+            logger.warning(
+                f"Oneline parser warning in {warning.file_path}:{warning.lineno} "
+                f"- {warning.sub_type}: {warning.msg}",
+            )
+
     analyse_projects.dump_markers()
 
 

tests/test_analyse.py

@@ -210,3 +210,18 @@ def test_git_root_auto_detection_when_not_configured(tmp_path):
     # We just verify it's not None (since this test runs in the sphinx-codelinks repo)
     assert src_analyse.git_root is not None
     assert (src_analyse.git_root / ".git").exists()
+        oneline_comment_style=ONELINE_COMMENT_STYLE_DEFAULT,
+    )
+
+def test_oneline_parser_warnings_are_collected(tmp_path):
+    """Test that oneline parser warnings are collected for later output."""
+    src_dir = TEST_DIR / "data" / "oneline_comment_default"
+    src_paths = [src_dir / "default_oneliners.c"]
+    src_analyse = SourceAnalyse(src_analyse_config)
+    src_analyse.run()
+
+    # Verify that warnings were collected
+    assert len(src_analyse.oneline_warnings) == 1
+    warning = src_analyse.oneline_warnings[0]
+    assert "too_many_fields" in warning.sub_type
+    assert warning.lineno == 17

tests/test_cmd.py

@@ -67,6 +67,43 @@ def test_analyse(config_path: Path, tmp_path: Path) -> None:
     assert marked_content
 
 
+def test_analyse_outputs_warnings(tmp_path: Path) -> None:
+    """Test that the analyse CLI command outputs warnings to console."""
+    # Create a config file that will produce warnings
+    src_dir = TEST_DIR / "data" / "oneline_comment_default"
+    config_dict = {
+        "codelinks": {
+            "outdir": str(tmp_path),
+            "projects": {
+                "test_project": {
+                    "source_discover": {
+                        "src_dir": str(src_dir),
+                        "include": ["*.c"],
+                        "comment_type": "cpp",
+                    },
+                    "analyse": {
+                        "get_oneline_needs": True,
+                        # Use default oneline_comment_style which will cause warnings
+                        # for the test file with too many fields
+                    },
+                }
+            },
+        }
+    }
+
+    config_file = tmp_path / "test_config.toml"
+    with config_file.open("w", encoding="utf-8") as f:
+        toml.dump(config_dict, f)
+
+    options: list[str] = ["analyse", str(config_file)]
+    result = runner.invoke(app, options)
+
+    assert result.exit_code == 0
+    # Verify that warnings are output to console
+    assert "Oneline parser warning" in result.output
+    assert "too_many_fields" in result.output
+
+
 @pytest.mark.parametrize(
     ("options", "stdout"),
     [