-
-
Notifications
You must be signed in to change notification settings - Fork 34.7k
gh-151128: Improve SyntaxError message for cross language keywords #151129
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.
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
Open
zang-langyan
wants to merge
4
commits into
python:main
Choose a base branch
from
zang-langyan:151128
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+100
−1
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
ba55af2
gh-151128 Improve SyntaxError message for match
zang-langyan bb0200a
suggestion does not compute full match distance
zang-langyan 3a2926f
add cross language keyword hints list as a general implementation
zang-langyan 27b89b6
trim trailing whitespace
zang-langyan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -1485,8 +1485,12 @@ def _find_keyword_typos(self): | |||||||
| # Limit the number of possible matches to try | ||||||||
| max_matches = 3 | ||||||||
| matches = [] | ||||||||
|
|
||||||||
| hint = _get_cross_language_keyword_hint(wrong_name) | ||||||||
| if hint: | ||||||||
| matches.append(hint) | ||||||||
| if _suggestions is not None: | ||||||||
| suggestion = _suggestions._generate_suggestions(keyword.kwlist, wrong_name) | ||||||||
| suggestion = _suggestions._generate_suggestions(keyword.kwlist + keyword.softkwlist, wrong_name) | ||||||||
| if suggestion: | ||||||||
| matches.append(suggestion) | ||||||||
| matches.extend(difflib.get_close_matches(wrong_name, keyword.kwlist, n=max_matches, cutoff=0.5)) | ||||||||
|
|
@@ -1787,6 +1791,20 @@ def print(self, *, file=None, chain=True, **kwargs): | |||||||
| }) | ||||||||
|
|
||||||||
|
|
||||||||
| # Cross-language keyword suggestions. | ||||||||
| _CROSS_LANGUAGE_KEYWORD_HINTS = frozendict({ | ||||||||
| # C/C++ equivalents | ||||||||
| 'switch': 'match', | ||||||||
| 'delete': 'del', | ||||||||
| # function define equivalents | ||||||||
| 'function': 'def', | ||||||||
| 'func': 'def', | ||||||||
| # null equivalents | ||||||||
| 'NULL': 'None', | ||||||||
| 'null': 'None', | ||||||||
| 'nil': 'None', | ||||||||
| }) | ||||||||
|
|
||||||||
| def _substitution_cost(ch_a, ch_b): | ||||||||
| if ch_a == ch_b: | ||||||||
| return 0 | ||||||||
|
|
@@ -1866,6 +1884,13 @@ def _get_cross_language_hint(obj, wrong_name): | |||||||
| return None | ||||||||
|
|
||||||||
|
|
||||||||
| def _get_cross_language_keyword_hint(wrong_name): | ||||||||
| """Check if wrong_name is a common keyword from another language | ||||||||
| """ | ||||||||
| hint = _CROSS_LANGUAGE_KEYWORD_HINTS.get(wrong_name) | ||||||||
| return hint | ||||||||
|
Comment on lines
+1890
to
+1891
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Or maybe just call the get method directly if there isn't any extra logic? |
||||||||
|
|
||||||||
|
|
||||||||
| def _get_safe___dir__(obj): | ||||||||
| # Use obj.__dir__() to avoid a TypeError when calling dir(obj). | ||||||||
| # See gh-131001 and gh-139933. | ||||||||
|
|
||||||||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice. This is actually a different feature. You can even open a separate issue and PR for this (if there is no already open). Anyway, this is a nice improvement.
I suggest to add also cases for
<>("not equal" in Pascal and Python 2), "=<", "=>" and "=!" (typo in "<=", ">=" and "!="), "===" ("is" in JavaScript and PHP).