Add newslines at end of generated files and do imports in sorted order

kittens/diff/options/parse.py

@@ -2,8 +2,8 @@
 # vim:fileencoding=utf-8
 
 import typing
-from kitty.conf.utils import merge_dicts, positive_int, python_string, to_color, to_color_or_none
 from kittens.diff.options.utils import parse_map, syntax_aliases
+from kitty.conf.utils import merge_dicts, positive_int, python_string, to_color, to_color_or_none
 
 
 class Parser:
@@ -117,4 +117,4 @@ def parse_conf_item(key: str, val: str, ans: typing.Dict[str, typing.Any]) -> bo
     if func is not None:
         func(val, ans)
         return True
-    return False
+    return False

kittens/diff/options/types.py

@@ -2,12 +2,12 @@
 # vim:fileencoding=utf-8
 
 import typing
-from kitty.types import ParsedShortcut
-import kitty.types
 from kitty.conf.utils import KeyAction, KittensKeyMap
 import kitty.conf.utils
 from kitty.rgb import Color
 import kitty.rgb
+from kitty.types import ParsedShortcut
+import kitty.types
 
 
 option_names = (  # {{{
@@ -138,4 +138,4 @@ defaults.map = [
     (ParsedShortcut(mods=0, key_name='<'), KeyAction('scroll_to', ('prev-match',))),
     (ParsedShortcut(mods=0, key_name='f'), KeyAction('start_search', (False, False))),
     (ParsedShortcut(mods=0, key_name='b'), KeyAction('start_search', (False, True))),
-]
+]