update

kovidgoyal · Jan 3, 2025 · cffc3c7 · cffc3c7
1 parent 855fd02
commit cffc3c7
Show file tree

Hide file tree

Showing 2 changed files with 447 additions and 437 deletions.
diff --git a/kitty/conf/generate.py b/kitty/conf/generate.py
@@ -4,7 +4,6 @@
 
 import inspect
 import os
-import pprint
 import re
 import textwrap
 from typing import Any, Callable, Dict, Iterator, List, Set, Tuple, Union, get_type_hints
@@ -279,6 +278,7 @@ def resolve_import(ftype: str) -> str:
     a('')
     a('')
     a('defaults = Options()')
+    a('')
     for option_name, (typ, mval) in is_mutiple_vars.items():
         a(f'defaults.{option_name} = {mval[""]!r}')
         if mval['macos']:
@@ -290,6 +290,7 @@ def resolve_import(ftype: str) -> str:
             a('if not is_macos:')
             a(f'    defaults.{option_name}.update({mval["linux"]!r}')
 
+    a('')
     for aname, func in action_parsers.items():
         a(f'defaults.{aname} = [')
         only: Dict[str, List[Tuple[str, Callable[..., Any]]]] = {}
@@ -304,6 +305,7 @@ def resolve_import(ftype: str) -> str:
                     a(f'    # {sc.name}')
                     a(f'    {val!r},')
         a(']')
+        a('')
         if only:
             imports.add(('kitty.constants', 'is_macos'))
             for cond, items in only.items():
@@ -312,6 +314,7 @@ def resolve_import(ftype: str) -> str:
                 for (text, parser_func) in items:
                     for val in parser_func(text):
                         a(f'    defaults.{aname}.append({val!r})')
+                a('')
 
     t('')
     t('')
@@ -385,8 +388,10 @@ def output_imports(imports: Set[Tuple[str, str]], add_module_imports: bool = Tru
             a(f'{name} = {cdefn}')
 
     a('')
-    a('option_names = (  # {{''{')
-    a(' ' + pprint.pformat(tuple(sorted(option_names, key=natural_keys)))[1:] + '  # }}''}')
+    a('option_names = (')
+    for option_name in sorted(option_names, key=natural_keys):
+        a(f'    {option_name!r},')
+    a(')')
     class_def = '\n'.join(preamble + ['', ''] + class_lines)
 
     preamble = ['# generated by gen-config.py DO NOT edit', '']