Add type checking for the various CLI options objects

kittens/ask/main.py

@@ -7,6 +7,7 @@ from contextlib import suppress
 
 from kitty.cli import parse_args
 from kitty.constants import cache_dir
+from kitty.cli_stub import AskCLIOptions
 
 from ..tui.operations import alternate_screen, styled
 from ..tui.handler import result_handler
@@ -89,7 +90,7 @@ def main(args):
     from kitty.shell import init_readline
     msg = 'Ask the user for input'
     try:
-        args, items = parse_args(args[1:], option_text, '', msg, 'kitty ask')
+        args, items = parse_args(args[1:], option_text, '', msg, 'kitty ask', result_class=AskCLIOptions)
     except SystemExit as e:
         if e.code != 0:
             print(e.args[0])

kittens/clipboard/main.py

@@ -6,6 +6,7 @@ import os
 import sys
 
 from kitty.cli import parse_args
+from kitty.cli_stub import ClipboardCLIOptions
 
 from ..tui.handler import Handler
 from ..tui.loop import Loop
@@ -81,7 +82,7 @@ usage = ''
 
 
 def main(args):
-    args, items = parse_args(args[1:], OPTIONS, usage, help_text, 'kitty +kitten clipboard')
+    args, items = parse_args(args[1:], OPTIONS, usage, help_text, 'kitty +kitten clipboard', result_class=ClipboardCLIOptions)
     if items:
         raise SystemExit('Unrecognized extra command line arguments')
     data = None

kittens/diff/config.py

@@ -12,7 +12,7 @@ from kitty.conf.definition import config_lines
 from kitty.constants import config_dir
 from kitty.rgb import color_as_sgr
 
-from .config_data import type_map, all_options
+from .config_data import type_convert, all_options
 
 defaults = None
 
@@ -89,7 +89,7 @@ def parse_config(lines, check_keys=True):
     parse_config_base(
         lines,
         defaults,
-        type_map,
+        type_convert,
         special_handling,
         ans,
         check_keys=check_keys

kittens/diff/config_data.py

@@ -3,10 +3,10 @@
 # License: GPL v3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
 
 
-from functools import partial
 # Utils  {{{
+from functools import partial
 from gettext import gettext as _
-from typing import Dict, Union
+from typing import Any, Dict, Union
 
 from kitty.conf.definition import Option, Shortcut, option_func
 from kitty.conf.utils import positive_int, python_string, to_color
@@ -120,4 +120,9 @@ k('prev_match', '<', 'scroll_to prev-match', _('Scroll to previous search match'
 k('search_forward_simple', 'f', 'start_search substring forward', _('Search forward (no regex)'))
 k('search_backward_simple', 'b', 'start_search substring backward', _('Search backward (no regex)'))
 
-type_map = {o.name: o.option_type for o in all_options.values() if isinstance(o, Option)}
+
+def type_convert(name: str, val: Any) -> Any:
+    o = all_options.get(name)
+    if isinstance(o, Option):
+        val = o.option_type(val)
+    return val

kittens/diff/main.py

@@ -15,6 +15,7 @@ from functools import partial
 from gettext import gettext as _
 
 from kitty.cli import CONFIG_HELP, parse_args
+from kitty.cli_stub import DiffCLIOptions
 from kitty.constants import appname
 from kitty.fast_data_types import wcswidth
 from kitty.key_encoding import RELEASE, enter_key, key_defs as K
@@ -542,7 +543,7 @@ def get_remote_file(path):
 
 def main(args):
     warnings.showwarning = showwarning
-    args, items = parse_args(args[1:], OPTIONS, usage, help_text, 'kitty +kitten diff')
+    args, items = parse_args(args[1:], OPTIONS, usage, help_text, 'kitty +kitten diff', result_class=DiffCLIOptions)
     if len(items) != 2:
         raise SystemExit('You must specify exactly two files/directories to compare')
     left, right = items

kittens/hints/main.py

@@ -11,6 +11,7 @@ from gettext import gettext as _
 from itertools import repeat
 
 from kitty.cli import parse_args
+from kitty.cli_stub import HintsCLIOptions
 from kitty.fast_data_types import set_clipboard_string
 from kitty.key_encoding import key_defs as K, backspace_key, enter_key
 from kitty.utils import screen_size_function
@@ -508,7 +509,7 @@ usage = ''
 
 
 def parse_hints_args(args):
-    return parse_args(args, OPTIONS, usage, help_text, 'kitty +kitten hints')
+    return parse_args(args, OPTIONS, usage, help_text, 'kitty +kitten hints', result_class=HintsCLIOptions)
 
 
 def main(args):

kittens/icat/main.py

@@ -14,6 +14,7 @@ from math import ceil
 from tempfile import NamedTemporaryFile
 
 from kitty.cli import parse_args
+from kitty.cli_stub import IcatCLIOptions
 from kitty.constants import appname
 from kitty.utils import TTYIO, fit_image, screen_size_function
 
@@ -343,7 +344,7 @@ def process_single_item(item, args, url_pat=None, maybe_dir=True):
 
 
 def main(args=sys.argv):
-    args, items = parse_args(args[1:], options_spec, usage, help_text, '{} +kitten icat'.format(appname))
+    args, items = parse_args(args[1:], options_spec, usage, help_text, '{} +kitten icat'.format(appname), result_class=IcatCLIOptions)
 
     if args.print_window_size:
         screen_size_function.ans = None

kittens/panel/main.py

@@ -8,6 +8,7 @@ import subprocess
 import sys
 
 from kitty.cli import parse_args
+from kitty.cli_stub import PanelCLIOptions
 from kitty.constants import is_macos
 
 OPTIONS = r'''
@@ -48,7 +49,7 @@ usage = 'program-to-run'
 
 
 def parse_panel_args(args):
-    return parse_args(args, OPTIONS, usage, help_text, 'kitty +kitten panel')
+    return parse_args(args, OPTIONS, usage, help_text, 'kitty +kitten panel', result_class=PanelCLIOptions)
 
 
 def call_xprop(*cmd, silent=False):

kittens/resize_window/main.py

@@ -6,6 +6,7 @@
 import sys
 
 from kitty.cli import parse_args
+from kitty.cli_stub import ResizeCLIOptions
 from kitty.cmds import cmap, parse_subcommand_cli
 from kitty.constants import version
 from kitty.key_encoding import CTRL, RELEASE, key_defs as K
@@ -119,7 +120,7 @@ The base vertical increment.
 def main(args):
     msg = 'Resize the current window'
     try:
-        args, items = parse_args(args[1:], OPTIONS, '', msg, 'resize_window')
+        args, items = parse_args(args[1:], OPTIONS, '', msg, 'resize_window', result_class=ResizeCLIOptions)
     except SystemExit as e:
         if e.code != 0:
             print(e.args[0], file=sys.stderr)

kittens/show_error/main.py

@@ -7,6 +7,7 @@ import sys
 from contextlib import suppress
 
 from kitty.cli import parse_args
+from kitty.cli_stub import ErrorCLIOptions
 
 from ..tui.operations import styled
 
@@ -19,7 +20,7 @@ The title for the error message.
 
 def real_main(args):
     msg = 'Show an error message'
-    args, items = parse_args(args[1:], OPTIONS, '', msg, 'hints')
+    args, items = parse_args(args[1:], OPTIONS, '', msg, 'hints', result_class=ErrorCLIOptions)
     error_message = sys.stdin.buffer.read().decode('utf-8')
     sys.stdin = open(os.ctermid())
     print(styled(args.title, fg_intense=True, fg='red', bold=True))

kittens/unicode_input/main.py

@@ -11,6 +11,7 @@ from functools import lru_cache
 from gettext import gettext as _
 
 from kitty.cli import parse_args
+from kitty.cli_stub import UnicodeCLIOptions
 from kitty.config import cached_values_for
 from kitty.constants import config_dir
 from kitty.fast_data_types import is_emoji_presentation_base, wcswidth
@@ -530,7 +531,7 @@ default form specified in the unicode standard for the symbol is used.
 
 
 def parse_unicode_input_args(args):
-    return parse_args(args, OPTIONS, usage, help_text, 'kitty +kitten unicode_input')
+    return parse_args(args, OPTIONS, usage, help_text, 'kitty +kitten unicode_input', result_class=UnicodeCLIOptions)
 
 
 def main(args):