Add support for new keywords from CMake 3.22

.pylintrc

@@ -23,4 +23,6 @@ disable=
     too-few-public-methods,
     too-many-ancestors,
 
+    unspecified-encoding,
+
     unsubscriptable-object # false positives

gersemi/__version__.py

@@ -4,4 +4,4 @@
 __license__ = "MPL 2.0"
 __title__ = "gersemi"
 __url__ = "https://github.com/BlankSpruce/gersemi"
-__version__ = "0.7.2"
+__version__ = "0.7.3"

gersemi/base_command_invocation_dumper.py

@@ -12,9 +12,7 @@ def format_command_with_short_name(self, begin, arguments, end):
         ):
             return "".join([self._indent(begin), formatted_arguments, end])
 
-        return "{}{}\n{}".format(
-            self._indent(begin), formatted_arguments, self._indent(end)
-        )
+        return f"{self._indent(begin)}{formatted_arguments}\n{self._indent(end)}"
 
     def _format_command_with_long_name(self, begin, arguments, end):
         with self.indented():

gersemi/command_invocation_dumpers/module_command_dumpers.py

@@ -542,6 +542,7 @@ class GTestDiscoverTests(
         "DISCOVERY_TIMEOUT",
         "XML_OUTPUT_DIR",
         "DISCOVERY_MODE",
+        "TEST_FILTER",
     ]
     multi_value_keywords = ["EXTRA_ARGS", "PROPERTIES"]
     keyword_formatters = {

gersemi/custom_command_definition_finder.py

@@ -31,8 +31,8 @@ def line_comment(self, children):
 
 class CMakeInterpreter(Interpreter):
     def __init__(self, stack=None):
-        self.stack = dict() if stack is None else stack
-        self.found_commands = dict()
+        self.stack = {} if stack is None else stack
+        self.found_commands = {}
 
     @property
     def _inner_scope(self):

gersemi/dumper.py

@@ -9,7 +9,7 @@ def __init__(self, width, custom_command_definitions):
         super().__init__(width)
 
     def file(self, tree):
-        result = "{}".format(self.__default__(tree))
+        result = self.__default__(tree)
         if result.endswith("\n"):
             return result
         return result + "\n"
@@ -36,7 +36,7 @@ def non_command_element(self, tree):
         return " ".join(self.visit(child) for child in tree.children)
 
     def line_comment(self, tree):
-        return self._indent("#{}".format("".join(tree.children)))
+        return self._indent(f"#{''.join(tree.children)}")
 
     def preformatted_block(self, tree):
         disable_formatter, *body, enable_formatter = tree.children

gersemi/runner.py

@@ -54,7 +54,7 @@ def find_custom_command_definitions_in_file_impl(filepath: Path) -> Dict[str, Ke
     with smart_open(filepath, "r") as f:
         code = f.read()
     if not has_custom_command_definition(code):
-        return dict()
+        return {}
 
     parse_tree = parser.parse(code)
     return find_custom_command_definitions(parse_tree)
@@ -69,7 +69,7 @@ def find_custom_command_definitions_in_file(
 def find_all_custom_command_definitions(
     paths: Iterable[Path], pool
 ) -> Dict[str, Keywords]:
-    result = dict()
+    result = {}
 
     files = get_files(paths)
     find = find_custom_command_definitions_in_file

tests/conftest.py

@@ -24,5 +24,5 @@ def parser_with_postprocessing(parser):  # pylint: disable=redefined-outer-name
 @pytest.fixture(scope="module")
 def formatter():
     return create_formatter(
-        do_sanity_check=False, line_length=80, custom_command_definitions=dict()
+        do_sanity_check=False, line_length=80, custom_command_definitions={}
     )

tests/tests_generator.py

@@ -54,7 +54,7 @@ def discover_input_only_cases(where, input_extension):
 
 
 def get_matching_output_filename(input_filename, output_extension):
-    return "{}{}".format(remove_extension(input_filename), output_extension)
+    return f"{remove_extension(input_filename)}{output_extension}"
 
 
 def make_input_output_case(input_filename, output_extension, where):
@@ -73,7 +73,7 @@ def discover_input_output_cases(where, input_extension, output_extension):
         matching_output_file = get_matching_output_filename(inp, output_extension)
         assert (
             matching_output_file in output_files
-        ), "Incomplete input-output pair, missing {}".format(matching_output_file)
+        ), f"Incomplete input-output pair, missing {matching_output_file}"
 
     return [make_input_output_case(inp, output_extension, where) for inp in input_files]