mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-19 23:14:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup previous PR

Browse Source
This commit is contained in:
Kovid Goyal
2023-09-03 18:59:37 +05:30
parent 07d9b95050
commit 4ffb22199b
3 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
kitty/conf/utils.py
View File

@@ -264,44 +264,40 @@ def _parse(
base_path_for_includes = config_dir
it = iter(lines)
line: str
nextLine: str = ""
nextLineNum = 0
line = ''
next_line: str = ''
next_line_num = 0
while True:
try:
if nextLine != "":
line = nextLine
if next_line:
line = next_line
else:
line = next(it).lstrip()
nextLineNum += 1
lineNum = nextLineNum
next_line_num += 1
line_num = next_line_num
try:
nextLine = next(it).lstrip()
nextLineNum += 1
next_line = next(it).lstrip()
next_line_num += 1
while nextLine.startswith('\\'):
if line.endswith("\n"):
line = line[:-1]
line += nextLine[1:]
while next_line.startswith('\\'):
line = line.rstrip('\n') + next_line[1:]
try:
nextLine = next(it).lstrip()
nextLineNum += 1
next_line = next(it).lstrip()
next_line_num += 1
except StopIteration:
nextLine = ""
next_line = ''
break
except StopIteration:
nextLine = ""
pass
next_line = ''
try:
with currently_parsing.set_line(line, lineNum):
with currently_parsing.set_line(line, line_num):
parse_line(line, parse_conf_item, ans, base_path_for_includes, accumulate_bad_lines)
except Exception as e:
if accumulate_bad_lines is None:
raise
accumulate_bad_lines.append(BadLine(lineNum, line.rstrip(), e, currently_parsing.file))
accumulate_bad_lines.append(BadLine(line_num, line.rstrip(), e, currently_parsing.file))
except StopIteration:
break