Skip to content

WIP: Adding type hints to formatter.py #947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

WIP: Adding type hints to formatter.py #947

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3d7b94
WIP: Adding type hints to formatter.py
Ben-Reg Jan 4, 2022
895fdc0
Formatted with Black
Ben-Reg Jan 6, 2022
8d71839
Added temp variable to allow for stricter typing.
Ben-Reg Jan 6, 2022
0ca23b1
Second attempt at stricter typing.
Ben-Reg Jan 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions bpython/formatter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,14 @@
# Pygments really kicks ass, it made it really easy to
# get the exact behaviour I wanted, thanks Pygments.:)

# mypy: disallow_untyped_defs=True
# mypy: disallow_untyped_calls=True


from typing import MutableMapping, Iterable, TextIO
from pygments.formatter import Formatter
from pygments.token import (
_TokenType,
Keyword,
Name,
Comment,
Expand Down Expand Up @@ -96,7 +101,9 @@ class BPythonFormatter(Formatter):
See the Pygments source for more info; it's pretty
straightforward."""

def __init__(self, color_scheme, **options):
def __init__(
self, color_scheme: MutableMapping[str, str], **options: str
) -> None:
self.f_strings = {}
for k, v in theme_map.items():
self.f_strings[k] = f"\x01{color_scheme[v]}"
Expand All @@ -106,14 +113,21 @@ def __init__(self, color_scheme, **options):
self.f_strings[k] += "I"
super().__init__(**options)

def format(self, tokensource, outfile):
o = ""
def format(
self,
tokensource: Iterable[MutableMapping[_TokenType, str]],
outfile: TextIO,
) -> None:
o: str = ""
for token, text in tokensource:
if text == "\n":
continue

while token not in self.f_strings:
token = token.parent
if token.parent is None:
break
else:
token = token.parent
o += f"{self.f_strings[token]}\x03{text}\x04"
outfile.write(o.rstrip())

Expand Down