#105 Fix passing of command line option to merge embedded languages

roskakori · May 12, 2024 · 4676492 · 4676492
1 parent a382af1
commit 4676492
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/pygount/command.py b/pygount/command.py
@@ -330,6 +330,7 @@ def apply_arguments(self, arguments=None):
         self.set_folders_to_skip(args.folders_to_skip, "option --folders-to-skip")
         self.set_generated_regexps(args.generated, "option --generated")
         self.set_has_duplicates(args.duplicates, "option --duplicates")
+        self.set_has_to_merge_embedded_languages(args.merge_embedded_languages, "option --merge-embedded-languages")
         self.set_is_verbose(args.verbose, "option --verbose")
         self.set_names_to_skip(args.names_to_skip, "option --folders-to-skip")
         self.set_output(args.out, "option --out")

diff --git a/tests/test_command.py b/tests/test_command.py
@@ -211,3 +211,19 @@ def test_can_write_all_output_formats(self):
         for output_format in VALID_OUTPUT_FORMATS:
             exit_code = command.pygount_command(["--format", output_format, PYGOUNT_SOURCE_FOLDER])
             self.assertEqual(exit_code, 0)
+
+    def test_can_merge_embedded_languages(self):
+        test_html_django_path = self.create_temp_file(
+            "some.html",
+            ["<!DOCTYPE html>", "{% load i18n %}", '<html lang="{{ language_code }}" />'],
+        )
+        cloc_xml_path = os.path.join(self.tests_temp_folder, "cloc.xml")
+        exit_code = command.pygount_command(
+            ["--merge-embedded-languages", "--format", "cloc-xml", "--out", cloc_xml_path, test_html_django_path]
+        )
+        assert exit_code == 0
+        assert os.path.exists(cloc_xml_path)
+        cloc_xml_root = ElementTree.parse(cloc_xml_path)
+        file_elements = cloc_xml_root.findall("files/file[@language='HTML']")
+        assert file_elements is not None
+        assert len(file_elements) == 1