lbatuska/cmake-language-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor formatter

Browse Source
This commit is contained in:
Regen
2020-02-29 19:45:36 +09:00
parent 66af586b2a
commit cc9877adbe
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/cmake_language_server/formatter.py
View File

@@ -91,11 +91,12 @@ def main(args: List[str] = None):
parser = ArgumentParser() parser = ArgumentParser()
parser.add_argument('lists', type=Path, nargs='*', help='CMake list files') parser.add_argument('lists', type=Path, nargs='*', help='CMake list files')
parser.add_argument('-i', group = parser.add_mutually_exclusive_group()
'--inplace', group.add_argument('-i',
action='store_true', '--inplace',
help='inplace edit') action='store_true',
parser.add_argument('-d', '--diff', action='store_true', help='show diff') help='inplace edit')
group.add_argument('-d', '--diff', action='store_true', help='show diff')
parser.add_argument('--version', parser.add_argument('--version',
action='version', action='version',
version=f'%(prog)s {__version__}') version=f'%(prog)s {__version__}')
@@ -114,14 +115,12 @@ def main(args: List[str] = None):
if not remain: if not remain:
with listpath.open('w') as fp: with listpath.open('w') as fp:
fp.write(formatted) fp.write(formatted)
elif args.diff:
diff = unified_diff(content.splitlines(True),
formatted.splitlines(True), str(listpath),
str(listpath), '(before formatting)',
'(after formatting)')
diffstr = ''.join(diff)
print(diffstr, end='')
else: else:
if args.diff: print(formatted, end='')
diff = unified_diff(content.splitlines(True),
formatted.splitlines(True), str(listpath),
str(listpath), '(before formatting)',
'(after formatting)')
diffstr = ''.join(diff)
if diffstr:
print(diffstr, end='')
else:
print(formatted, end='')