MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-03-20 09:39:01 +00:00
Code Issues Releases Wiki Activity

allow commands to wraps other commands for correction

Browse Source
This commit is contained in:
Tin Lai 2020-06-09 15:44:28 +10:00
parent 6975d30818
commit 31fa0bae12
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
thefuck/const.py
View File

@ -40,6 +40,7 @@ DEFAULT_SETTINGS = {'rules': DEFAULT_RULES,
'wait_slow_command': 15, 'wait_slow_command': 15,
'slow_commands': ['lein', 'react-native', 'gradle', 'slow_commands': ['lein', 'react-native', 'gradle',
'./gradlew', 'vagrant'], './gradlew', 'vagrant'],
'wraps_commands': {},
'repeat': False, 'repeat': False,
'instant_mode': False, 'instant_mode': False,
'num_close_matches': 3, 'num_close_matches': 3,

2
thefuck/rules/git_stash.py
View File

@ -11,5 +11,5 @@ def match(command):
@git_support @git_support
def get_new_command(command): def get_new_command(command):
formatme = shell.and_('git stash', '{}') formatme = shell.and_('{} stash'.format(command.script_parts[0]), '{}')
return formatme.format(command.script) return formatme.format(command.script)

3
thefuck/rules/git_stash_pop.py
View File

@ -11,7 +11,8 @@ def match(command):
@git_support @git_support
def get_new_command(command): def get_new_command(command):
return shell.and_('git add --update', 'git stash pop', 'git reset .') cmd = command.script_parts[0]
return shell.and_('{} add --update'.format(cmd), '{} stash pop'.format(cmd), '{} reset .'.format(cmd))
# make it come before the other applicable rules # make it come before the other applicable rules

2
thefuck/rules/scm_correction.py
View File

@ -19,7 +19,7 @@ def _get_actual_scm():
return scm return scm
@for_app(*wrong_scm_patterns.keys()) @for_app(*wrong_scm_patterns.keys(), strict=True)
def match(command): def match(command):
scm = command.script_parts[0] scm = command.script_parts[0]
pattern = wrong_scm_patterns[scm] pattern = wrong_scm_patterns[scm]

14
thefuck/utils.py
View File

@ -167,15 +167,23 @@ def replace_command(command, broken, matched):
@memoize @memoize
def is_app(command, *app_names, **kwargs): def is_app(command, *app_names, strict=False, **kwargs):
"""Returns `True` if command is call to one of passed app names.""" """Returns `True` if command is call to one of passed app names. If `strict=True`, skip checking for wrapped commands."""
at_least = kwargs.pop('at_least', 0) at_least = kwargs.pop('at_least', 0)
if kwargs: if kwargs:
raise TypeError("got an unexpected keyword argument '{}'".format(kwargs.keys())) raise TypeError("got an unexpected keyword argument '{}'".format(kwargs.keys()))
if len(command.script_parts) > at_least: if len(command.script_parts) > at_least:
return command.script_parts[0] in app_names cmd = command.script_parts[0]
if cmd in app_names:
return True
if not strict:
# allow command to be wrapped as another command
wrapped_cmd = [settings['wraps_commands'].get(a, []) for a in app_names]
for wrapped in wrapped_cmd:
if cmd in wrapped:
return True
return False return False