Merge pull request #693 from Fortran-FOSS-Programmers/override-fixed-extensions

Raise error if fixed-form extension also appears in `extensions`

Author: ZedThree

ford/settings.py

@@ -222,6 +222,12 @@ def __post_init__(self):
             if get_origin(default_type) is list and not isinstance(value, list):
                 setattr(self, key, [value])
 
+        for fixed_extension in self.fixed_extensions:
+            if fixed_extension in self.extensions:
+                raise ValueError(
+                    f"Fixed-form extension '{fixed_extension}' also appears in free-form extension list (`extensions = {self.extensions}`)"
+                )
+
         self.display = [item.lower() for item in self.display]
         self.extensions = list(set(self.extensions) | set(self.fpp_extensions))
         self.exclude_dir.append(self.output_dir)
@@ -304,7 +310,10 @@ def load_toml_settings(directory: PathLike) -> Optional[ProjectSettings]:
         return None
 
     print(f"Reading Ford options from {filename.absolute()}")
-    return ProjectSettings(**settings["extra"]["ford"])
+    try:
+        return ProjectSettings(**settings["extra"]["ford"])
+    except ValueError as e:
+        raise ValueError(f"Error parsing settings from '{filename}': {e}")
 
 
 def load_markdown_settings(
@@ -326,7 +335,12 @@ def load_markdown_settings(
             include_preprocessor = IncludePreprocessor(None, configs)
             settings[option] = "\n".join(include_preprocessor.run(value.splitlines()))
 
-    return ProjectSettings.from_markdown_metadata(settings), "\n".join(project_lines)
+    try:
+        return ProjectSettings.from_markdown_metadata(settings), "\n".join(
+            project_lines
+        )
+    except ValueError as e:
+        raise ValueError(f"Error parsing settings from '{filename}': {e}")
 
 
 def convert_setting(default_type: Type, key: str, value: Any) -> Any:

test/test_settings.py

@@ -144,3 +144,21 @@ def test_extra_filetype_error():
 
     with pytest.raises(ValueError):
         ExtraFileType.from_string("c // c lexer")
+
+
+def test_duplicated_fixed_extension():
+    text = dedent(
+        '''\
+    project = "some project"
+    src_dir = "source"
+    summary = """
+    first
+    second"""
+    preprocess = true
+    fpp_extensions = ["fpp", "F90"]
+    fixed_extensions = ["f"]
+    extensions = ["f90", "f"]
+        '''
+    )
+    with pytest.raises(ValueError):
+        ProjectSettings(**tomllib.loads(text))