KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use a Literal as the type for choice based options

Browse Source
This commit is contained in:
Kovid Goyal 2020-04-24 19:45:51 +05:30
parent 5762baeed7
commit c92aca5d19
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kitty/conf/definition.py
View File

@ -9,7 +9,7 @@ from typing import (
Set, Tuple, Union, get_type_hints Set, Tuple, Union, get_type_hints
) )
from .utils import to_bool from .utils import Choice, to_bool
def to_string(x: str) -> str: def to_string(x: str) -> str:
@ -56,6 +56,8 @@ class Option:
if type(self.option_type) is type: if type(self.option_type) is type:
return type_name(self.option_type) return type_name(self.option_type)
if isinstance(self.option_type, Choice):
return 'typing.Literal[{}]'.format(','.join(f'{x!r}' for x in self.option_type.all_choices))
th = get_type_hints(self.option_type) th = get_type_hints(self.option_type)
try: try:
rettype = th['return'] rettype = th['return']

18
kitty/conf/utils.py
View File

@ -68,17 +68,21 @@ def python_string(text: str) -> str:
return ans return ans
def choices(*choices: str) -> Callable[[str], str]: class Choice:
defval = choices[0]
uc = frozenset(choices)
def choice(x: str) -> str: def __init__(self, choices: Sequence[str]):
self.defval = choices[0]
self.all_choices = frozenset(choices)
def __call__(self, x: str) -> str:
x = x.lower() x = x.lower()
if x not in uc: if x not in self.all_choices:
x = defval x = self.defval
return x return x
return choice
def choices(*choices: str) -> Choice:
return Choice(choices)
def parse_line( def parse_line(