MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2025-10-31 15:12:20 +00:00
Code Issues Releases Wiki Activity

Merge pull request #693 from sQu1rr/master

Browse Source 
fixes #692 : multiline PS1 breaking instant mode
This commit is contained in:
Vladimir Iakovlev
2017-09-27 19:09:20 +03:00
committed by GitHub
parent 20779731d3 d34b3ada71
commit e94f420cb1
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
thefuck/output_readers/read_log.py
View File

@@ -11,6 +11,10 @@ from .. import const, logs
def _group_by_calls(log): def _group_by_calls(log):
ps1 = os.environ['PS1']
ps1_newlines = ps1.count('\\n') + ps1.count('\n')
ps1_counter = 0
script_line = None script_line = None
lines = [] lines = []
for line in log: for line in log:
@@ -19,10 +23,16 @@ def _group_by_calls(log):
except UnicodeDecodeError: except UnicodeDecodeError:
continue continue
if const.USER_COMMAND_MARK in line: if const.USER_COMMAND_MARK in line or ps1_counter > 0:
if script_line: if script_line and ps1_counter == 0:
yield script_line, lines yield script_line, lines
if ps1_newlines > 0:
if ps1_counter <= 0:
ps1_counter = ps1_newlines
else:
ps1_counter -= 1
script_line = line script_line = line
lines = [line] lines = [line]
elif script_line is not None: elif script_line is not None: