kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9090 'clint.py: --stdin-filename'

Browse Source
This commit is contained in:
Justin M. Keyes 2018-10-06 15:17:52 +02:00 committed by GitHub
commit 6fe9a12268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/clint.py
View File

@ -49,6 +49,7 @@ from __future__ import unicode_literals
import codecs import codecs
import copy import copy
import fileinput
import getopt import getopt
import math # for log import math # for log
import os import os
@ -65,7 +66,7 @@ _USAGE = """
Syntax: clint.py [--verbose=#] [--output=vs7] [--filter=-x,+y,...] Syntax: clint.py [--verbose=#] [--output=vs7] [--filter=-x,+y,...]
[--counting=total|toplevel|detailed] [--root=subdir] [--counting=total|toplevel|detailed] [--root=subdir]
[--linelength=digits] [--record-errors=file] [--linelength=digits] [--record-errors=file]
[--suppress-errors=file] [--suppress-errors=file] [--stdin-filename=filename]
<file> [file] ... <file> [file] ...
The style guidelines this tries to follow are those in The style guidelines this tries to follow are those in
@ -167,6 +168,9 @@ Syntax: clint.py [--verbose=#] [--output=vs7] [--filter=-x,+y,...]
suppress-errors=file suppress-errors=file
Errors listed in the given file will not be reported. Errors listed in the given file will not be reported.
stdin-filename=filename
Use specified filename when reading from stdin (file "-").
""" """
# We categorize each error message we print. Here are the categories. # We categorize each error message we print. Here are the categories.
@ -3456,10 +3460,12 @@ def ProcessFile(filename, vlevel, extra_check_functions=[]):
# is processed. # is processed.
if filename == '-': if filename == '-':
lines = codecs.StreamReaderWriter(sys.stdin, stdin = sys.stdin.read()
codecs.getreader('utf8'), if sys.version_info < (3, 0):
codecs.getwriter('utf8'), stdin = stdin.decode('utf8')
'replace').read().split('\n') lines = stdin.split('\n')
if _cpplint_state.stdin_filename is not None:
filename = _cpplint_state.stdin_filename
else: else:
lines = codecs.open( lines = codecs.open(
filename, 'r', 'utf8', 'replace').read().split('\n') filename, 'r', 'utf8', 'replace').read().split('\n')
@ -3540,7 +3546,9 @@ def ParseArguments(args):
'linelength=', 'linelength=',
'extensions=', 'extensions=',
'record-errors=', 'record-errors=',
'suppress-errors=']) 'suppress-errors=',
'stdin-filename=',
])
except getopt.GetoptError: except getopt.GetoptError:
PrintUsage('Invalid arguments.') PrintUsage('Invalid arguments.')
@ -3550,6 +3558,7 @@ def ParseArguments(args):
counting_style = '' counting_style = ''
record_errors_file = None record_errors_file = None
suppress_errors_file = None suppress_errors_file = None
stdin_filename = None
for (opt, val) in opts: for (opt, val) in opts:
if opt == '--help': if opt == '--help':
@ -3586,6 +3595,8 @@ def ParseArguments(args):
record_errors_file = val record_errors_file = val
elif opt == '--suppress-errors': elif opt == '--suppress-errors':
suppress_errors_file = val suppress_errors_file = val
elif opt == '--stdin-filename':
stdin_filename = val
if not filenames: if not filenames:
PrintUsage('No files were specified.') PrintUsage('No files were specified.')
@ -3596,6 +3607,7 @@ def ParseArguments(args):
_SetCountingStyle(counting_style) _SetCountingStyle(counting_style)
_SuppressErrorsFrom(suppress_errors_file) _SuppressErrorsFrom(suppress_errors_file)
_RecordErrorsTo(record_errors_file) _RecordErrorsTo(record_errors_file)
_cpplint_state.stdin_filename = stdin_filename
return filenames return filenames