Add more type annotations

kittens/diff/highlight.py

@@ -21,7 +21,7 @@ class StyleNotFound(Exception):
     pass
 
 
-class DiffFormatter(Formatter):
+class DiffFormatter(Formatter):  # type: ignore
 
     def __init__(self, style: str = 'default') -> None:
         try:

kittens/panel/main.py

@@ -5,11 +5,11 @@ import os
 import shutil
 import subprocess
 import sys
-from typing import Callable, Dict, List, Tuple
+from typing import Any, Callable, Dict, List, Tuple
 
 from kitty.cli import parse_args
 from kitty.cli_stub import PanelCLIOptions
-from kitty.constants import is_macos, appname
+from kitty.constants import appname, is_macos
 from kitty.os_window_size import WindowSizeData
 
 OPTIONS = r'''
@@ -119,7 +119,7 @@ def setup_x11_window(win_id: int) -> None:
     func(win_id, window_width, window_height)
 
 
-def initial_window_size_func(opts: WindowSizeData, cached_values: Dict) -> Callable[[int, int, float, float, float, float], Tuple[int, int]]:
+def initial_window_size_func(opts: WindowSizeData, cached_values: Dict[str, Any]) -> Callable[[int, int, float, float, float, float], Tuple[int, int]]:
     from kitty.fast_data_types import glfw_primary_monitor_size
 
     def initial_window_size(cell_width: int, cell_height: int, dpi_x: float, dpi_y: float, xscale: float, yscale: float) -> Tuple[int, int]:
@@ -154,7 +154,7 @@ def main(sys_args: List[str]) -> None:
     for override in args.override:
         sys.argv.extend(('--override', override))
     sys.argv.extend(items)
-    from kitty.main import run_app, main as real_main
+    from kitty.main import main as real_main, run_app
     run_app.cached_values_name = 'panel'
     run_app.first_window_callback = setup_x11_window
     run_app.initial_window_size_func = initial_window_size_func

kittens/ssh/completion.py

@@ -295,7 +295,7 @@ def complete_q_choices(ans: Completions, prefix: str, title: str, key: str, comm
 def complete_arg(ans: Completions, option_flag: str, prefix: str = '') -> None:
     options = ssh_options()
     option_name = options.get(option_flag[1:])
-    if option_name.endswith('file') or option_name.endswith('path'):
+    if option_name and (option_name.endswith('file') or option_name.endswith('path')):
         return complete_files_and_dirs(ans, prefix, option_name)
     choices = {
         'mac_spec': ('MAC algorithm', 'mac', True),

kittens/transfer/receive.py

@@ -146,7 +146,7 @@ class Manager:
                     self.failed_specs[fid] = ftc.status
                 else:
                     if ftc.status == 'OK':
-                        self.state == State.transferring
+                        self.state = State.transferring
                         return ''
                     else:
                         return ftc.status

kittens/transfer/utils.py

@@ -5,7 +5,7 @@ import os
 from contextlib import contextmanager
 from datetime import timedelta
 from mimetypes import guess_type
-from typing import Callable, Generator, Union, cast
+from typing import Callable, Generator, Union
 
 from kitty.fast_data_types import truncate_point_for_length, wcswidth
 from kitty.types import run_once
@@ -154,8 +154,7 @@ def short_uuid_func() -> Callable[[], str]:
 
 
 def random_id() -> str:
-    f = short_uuid_func()
-    return cast(str, f())
+    return short_uuid_func()()
 
 
 @contextmanager