Skip to content

Changed dict key-matching regex to capture any valid dict key #920

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

Merged
thomasballinger merged 13 commits into from
Oct 6, 2021
+61 −2
Merged

Changed dict key-matching regex to capture any valid dict key #920

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eb321aa
Changed dict key-matching regex to capture any valid dict key
arian-deimling Sep 27, 2021
3f20d8e
dict key matching regex no longer matches beyond the end of a key
arian-deimling Sep 28, 2021
97d6b19
Updated regex to handle str, bytes, int, float, tuple dict keys
arian-deimling Sep 29, 2021
5bfd09c
Added tests for regex changes in prior commit
arian-deimling Sep 29, 2021
e470176
removed erroneous print()
arian-deimling Sep 29, 2021
5299f2b
Added comments to regex using re.VERBOSE flag
arian-deimling Sep 29, 2021
12ff50d
Removed unnecessary regular expressions
arian-deimling Sep 29, 2021
d57f008
Removed old commented-out code
arian-deimling Sep 29, 2021
a0f7fae
minor formatting changes to pass black linter test
arian-deimling Sep 29, 2021
236dc0b
formatting change; adjusted single-quote string regex; added tests
arian-deimling Oct 1, 2021
286d71c
modified test to test strings containing '[' and ']'
arian-deimling Oct 1, 2021
01ed93b
added test case for string dict key being typed inside []
arian-deimling Oct 1, 2021
0a08f41
ran black formatter on file
arian-deimling Oct 1, 2021
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
Prev Previous commit
Next Next commit
Removed unnecessary regular expressions
  • Loading branch information
@arian-deimling
arian-deimling committed Sep 29, 2021
commit 12ff50d035743678b20106bfa10a69650c1642a9
39 changes: 6 additions & 33 deletions bpython/line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,41 +65,14 @@ def current_word(cursor_offset: int, line: str) -> Optional[LinePart]:
# end matching at closing double-quote if one is present
"?"""

_match_int_and_float = \
r"""\-? # match a negative sign if present
\d+ # match any number of digits
(?:\.\d*)? # if there is a decimal point, match it and subsequent digits
|\- # if only a negative sign has been entered, match it
"""

# used to match possible elements in a tuple
_match_tuple_element = (
f'(?:{_match_single_quote_str_bytes}|' # match single quote str/bytes repr
f'{_match_double_quote_str_bytes}|' # or double quote str/bytes repr
f'{_match_int_and_float})' # or int or float repr
)

_match_tuple = \
rf""" # match open parenthesis
\(
# matches any number of tuple elements followed by `,` then ` `
(?:{_match_tuple_element},[ ])*
# followed by another element being typed or one element tuple i.e. `(1,)`
(?:{_match_tuple_element},?)?
# match close parentesis if present
\)?
"""

# match valid identifier name followed by `[` character
_match_dict_before_key = r"""[\w_][\w0-9._]*\["""

_current_dict_key_re = LazyReCompile(
f'{_match_dict_before_key}('
f'{_match_dict_before_key}((?:'
f'{_match_single_quote_str_bytes}|'
f'{_match_double_quote_str_bytes}|'
f'{_match_int_and_float}|'
f'{_match_tuple}|'
f'{_match_all_dict_keys}|)',
f'{_match_all_dict_keys}|)*)',
re.VERBOSE
)

Expand All @@ -116,12 +89,12 @@ def current_dict_key(cursor_offset: int, line: str) -> Optional[LinePart]:
_capture_dict_name = r"""([\w_][\w0-9._]*)\["""

_current_dict_re = LazyReCompile(
f'{_capture_dict_name}('
f'{_capture_dict_name}((?:'
f'{_match_single_quote_str_bytes}|'
f'{_match_double_quote_str_bytes}|'
f'{_match_int_and_float}|'
f'{_match_tuple}|'
f'{_match_all_dict_keys}|)',
# f'{_match_int_and_float}|'
# f'{_match_tuple}|'
f'{_match_all_dict_keys}|)*)',
re.VERBOSE
)

Expand Down