Auto merge of #3045 - micbou:flake8-ycm, r=puremourning

[READY] Enforce YCM coding style

See PR https://github.com/Valloric/ycmd/pull/1047.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/youcompleteme/3045)
<!-- Reviewable:end -->
This commit is contained in:
zzbot 2018-06-02 07:46:13 -07:00 committed by GitHub
commit 2dcb3e91ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 140 additions and 138 deletions

View File

@ -1,5 +1,6 @@
flake8 >= 3.0.0 flake8 >= 3.0.0
flake8-comprehensions >= 1.4.1 flake8-comprehensions >= 1.4.1
flake8-ycm >= 0.1.0
mock >= 1.0.1 mock >= 1.0.1
nose >= 1.3.7 nose >= 1.3.7
PyHamcrest >= 1.8.0 PyHamcrest >= 1.8.0

View File

@ -977,7 +977,8 @@ def InsertNamespace( namespace ):
def SearchInCurrentBuffer( pattern ): def SearchInCurrentBuffer( pattern ):
""" Returns the 1-indexed line on which the pattern matches """ Returns the 1-indexed line on which the pattern matches
(going UP from the current position) or 0 if not found """ (going UP from the current position) or 0 if not found """
return GetIntValue( "search('{0}', 'Wcnb')".format( EscapeForVim( pattern ))) return GetIntValue(
"search('{0}', 'Wcnb')".format( EscapeForVim( pattern ) ) )
def LineTextInCurrentBuffer( line_number ): def LineTextInCurrentBuffer( line_number ):

View File

@ -1,4 +1,4 @@
[flake8] [flake8]
ignore = E111,E114,E121,E125,E126,E127,E128,E129,E131,E133,E201,E202,E203,E211,E221,E222,E241,E251,E261,E303,E402,W503 ignore = E111,E114,E121,E125,E126,E127,E128,E129,E131,E133,E201,E202,E203,E221,E222,E241,E251,E261,E303,E402,W503
max-complexity = 10 max-complexity = 10
max-line-length = 80 max-line-length = 80