NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit11fda20

committed

Fix folding and pylint update

1 parentb1fcd4f commit11fda20Copy full SHA for 11fda20

File tree

58 files changed

+3769

-2248

lines changed

Changelog.rst
autoload/pymode
- folding.vim
pylibs
- logilab
- pylint
  - README
  - README.Python3
  - __pkginfo__.py
  - checkers
  - epylint.py
  - gui.py
  - lint.py
  - pyreverse
  - reporters
  - utils.py
- pymode
  - lint.py

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3769

-2248

lines changed

`‎Changelog.rst`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,15 @@`
`1`	`1`	`Changelog`
`2`	`2`	`=========`
`3`	`3`
`4`		`-## 2012-XX-XX.....`
	`4`	`+## 2012-XX-XX0.6.5`
`5`	`5`	`-------------------`
`6`	`6`	`* Updated Pep8 to version 1.3.3`
	`7`	`+* Updated Pylint to version 0.25.2`
`7`	`8`	`* Fixed virtualenv support for windows users`
`8`	`9`	`* Added pymode modeline ':help PythonModeModeline'`
`9`	`10`	`* Added diagnostic tool ':call pymode#troubleshooting#Test()'`
`10`	`11`	`* Async code checking`
	`12`	`+* Improve speed of pymode folding`
`11`	`13`
`12`	`14`	`## 2012-05-24 0.6.4`
`13`	`15`	`-------------------`

`‎autoload/pymode/folding.vim`

Lines changed: 19 additions & 65 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`" Python-mode folding functions`
`2`	`2`
`3`	`3`
`4`		`-lets:defpat='^\s$@\\|class\s.:\\|def\s$'`
	`4`	`+lets:blank_regex='^\s*$'`
	`5`	`+lets:def_regex='^\s*$class\\|def$ \w\+'`
`5`	`6`
`6`	`7`
`7`	`8`	`fun!pymode#folding#text()" {{{`
`@@ -25,81 +26,34 @@ fun! pymode#folding#text() " {{{`
`25`	`26`	`endfunction"}}}`
`26`	`27`
`27`	`28`
`28`		`-fun!pymode#folding#indent(lnum)"{{{`
`29`		`-letindent=indent(pymode#BlockStart(a:lnum))`
`30`		`-returnindent ?indent+ &shiftwidth :0`
`31`		`-endfunction"}}}`
`32`		`-`
`33`		`-`
`34`	`29`	`fun!pymode#folding#expr(lnum)"{{{`
	`30`	`+`
`35`	`31`	`letline=getline(a:lnum)`
`36`	`32`	`letindent=indent(a:lnum)`
`37`	`33`
`38`		`-ifline==''`
`39`		`-returngetline(a:lnum+1)=='' ?'=' :'-1'`
`40`		`-endif`
`41`		`-`
`42`		`-ifline=~s:defpat&&getline(prevnonblank(a:lnum-1))!~'^\s*@'`
`43`		`-letn=a:lnum`
`44`		`-whilegetline(n)=~'^\s*@'`
`45`		`-letn=nextnonblank(n+1)`
`46`		`-endwhile`
`47`		`-ifgetline(n)=~s:defpat`
`48`		`-return">".(indent/&shiftwidth+1)`
`49`		`-endif`
	`34`	`+ifline=~s:def_regex`
	`35`	`+return">".(indent / &shiftwidth+1)`
`50`	`36`	`endif`
`51`	`37`
`52`		`-letp=prevnonblank(a:lnum-1)`
`53`		`-whilep>0&&getline(p)=~'^\s*#'`
`54`		`-letp=prevnonblank(p-1)`
`55`		`-endwhile`
`56`		`-let pind=indent(p)`
`57`		`-ifgetline(p)=~s:defpat&&getline(prevnonblank(a:lnum-1))!~'^\s*@'`
`58`		`-let pind= pind+ &shiftwidth`
`59`		`-elseifp==0`
`60`		`-let pind=0`
	`38`	`+ifline=~'^\s*@'`
	`39`	`+return-1`
`61`	`40`	`endif`
`62`	`41`
`63`		`-if (indent>0&&indent==pind)\|\|indent>pind`
`64`		`-return'='`
`65`		`-elseifindent==0`
`66`		`-if pind==0&&line=~'^#'`
`67`		`-return0`
`68`		`-elseifline!~'^#'`
`69`		`-if0<pind&&line!~'^else\s:\\|^except.:\\|^elif.:\\|^finally\s:'`
`70`		`-return'>1'`
`71`		`-elseif0==pind&&getline(prevnonblank(a:lnum-1))=~'^\s*#'`
`72`		`-return'>1'`
`73`		`-else`
`74`		`-return'='`
`75`		`-endif`
`76`		`-endif`
`77`		`-letn=nextnonblank(a:lnum+1)`
`78`		`-whilen>0&&getline(n)=~'^\s*#'`
`79`		`-letn=nextnonblank(n+1)`
`80`		`-endwhile`
`81`		`-ifindent(n)==0`
`82`		`-return0`
`83`		`-else`
	`42`	`+ifline=~s:blank_regex`
	`43`	`+let prev_line=getline(a:lnum-1)`
	`44`	`+if prev_line=~s:blank_regex`
`84`	`45`	`return-1`
`85`		`-end`
`86`		`-endif`
`87`		`-let blockindent=indent(pymode#BlockStart(a:lnum))+ &shiftwidth`
`88`		`-if blockindent==0`
`89`		`-return1`
	`46`	`+else`
	`47`	`+returnfoldlevel(prevnonblank(a:lnum))`
	`48`	`+endif`
`90`	`49`	`endif`
`91`		`-letn=nextnonblank(a:lnum+1)`
`92`		`-whilen>0&&getline(n)=~'^\s*#'`
`93`		`-letn=nextnonblank(n+1)`
`94`		`-endwhile`
`95`		`-let nind=indent(n)`
`96`		`-ifline=~'^\s*#'&&indent>=nind`
`97`		`-return-1`
`98`		`-elseifline=~'^\s*#'`
`99`		`-return nind / &shiftwidth`
`100`		`-else`
`101`		`-return blockindent / &shiftwidth`
	`50`	`+`
	`51`	`+ifindent==0`
	`52`	`+return0`
`102`	`53`	`endif`
	`54`	`+`
	`55`	`+return'='`
	`56`	`+`
`103`	`57`	`endfunction"}}}`
`104`	`58`
`105`	`59`

`‎pylibs/logilab/init.py`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +0,0 @@`
`1`		`-"""generated file, don't modify or your data will be lost"""`
`2`		`-# try:`
`3`		`-# __import__('pkg_resources').declare_namespace(__name__)`
`4`		`-# except ImportError:`
`5`		`-# pass`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit11fda20

File tree

58 files changed

Some content is hidden

58 files changed

`‎Changelog.rst`

`‎autoload/pymode/folding.vim`

`‎pylibs/logilab/init.py`

0 commit comments

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`" Python-mode folding functions`
`2`	`2`
`3`	`3`
`4`		`-lets:defpat='^\s\(@\\|class\s.:\\|def\s\)'`
	`4`	`+lets:blank_regex='^\s*$'`
	`5`	`+lets:def_regex='^\s*\(class\\|def\) \w\+'`
`5`	`6`
`6`	`7`
`7`	`8`	`fun!pymode#folding#text()" {{{`
`@@ -25,81 +26,34 @@ fun! pymode#folding#text() " {{{`
`25`	`26`	`endfunction"}}}`
`26`	`27`
`27`	`28`
`28`		`-fun!pymode#folding#indent(lnum)"{{{`
`29`		`-letindent=indent(pymode#BlockStart(a:lnum))`
`30`		`-returnindent ?indent+ &shiftwidth :0`
`31`		`-endfunction"}}}`
`32`		`-`
`33`		`-`
`34`	`29`	`fun!pymode#folding#expr(lnum)"{{{`
	`30`	`+`
`35`	`31`	`letline=getline(a:lnum)`
`36`	`32`	`letindent=indent(a:lnum)`
`37`	`33`
`38`		`-ifline==''`
`39`		`-returngetline(a:lnum+1)=='' ?'=' :'-1'`
`40`		`-endif`
`41`		`-`
`42`		`-ifline=~s:defpat&&getline(prevnonblank(a:lnum-1))!~'^\s*@'`
`43`		`-letn=a:lnum`
`44`		`-whilegetline(n)=~'^\s*@'`
`45`		`-letn=nextnonblank(n+1)`
`46`		`-endwhile`
`47`		`-ifgetline(n)=~s:defpat`
`48`		`-return">".(indent/&shiftwidth+1)`
`49`		`-endif`
	`34`	`+ifline=~s:def_regex`
	`35`	`+return">".(indent / &shiftwidth+1)`
`50`	`36`	`endif`
`51`	`37`
`52`		`-letp=prevnonblank(a:lnum-1)`
`53`		`-whilep>0&&getline(p)=~'^\s*#'`
`54`		`-letp=prevnonblank(p-1)`
`55`		`-endwhile`
`56`		`-let pind=indent(p)`
`57`		`-ifgetline(p)=~s:defpat&&getline(prevnonblank(a:lnum-1))!~'^\s*@'`
`58`		`-let pind= pind+ &shiftwidth`
`59`		`-elseifp==0`
`60`		`-let pind=0`
	`38`	`+ifline=~'^\s*@'`
	`39`	`+return-1`
`61`	`40`	`endif`
`62`	`41`
`63`		`-if (indent>0&&indent==pind)\|\|indent>pind`
`64`		`-return'='`
`65`		`-elseifindent==0`
`66`		`-if pind==0&&line=~'^#'`
`67`		`-return0`
`68`		`-elseifline!~'^#'`
`69`		`-if0<pind&&line!~'^else\s:\\|^except.:\\|^elif.:\\|^finally\s:'`
`70`		`-return'>1'`
`71`		`-elseif0==pind&&getline(prevnonblank(a:lnum-1))=~'^\s*#'`
`72`		`-return'>1'`
`73`		`-else`
`74`		`-return'='`
`75`		`-endif`
`76`		`-endif`
`77`		`-letn=nextnonblank(a:lnum+1)`
`78`		`-whilen>0&&getline(n)=~'^\s*#'`
`79`		`-letn=nextnonblank(n+1)`
`80`		`-endwhile`
`81`		`-ifindent(n)==0`
`82`		`-return0`
`83`		`-else`
	`42`	`+ifline=~s:blank_regex`
	`43`	`+let prev_line=getline(a:lnum-1)`
	`44`	`+if prev_line=~s:blank_regex`
`84`	`45`	`return-1`
`85`		`-end`
`86`		`-endif`
`87`		`-let blockindent=indent(pymode#BlockStart(a:lnum))+ &shiftwidth`
`88`		`-if blockindent==0`
`89`		`-return1`
	`46`	`+else`
	`47`	`+returnfoldlevel(prevnonblank(a:lnum))`
	`48`	`+endif`
`90`	`49`	`endif`
`91`		`-letn=nextnonblank(a:lnum+1)`
`92`		`-whilen>0&&getline(n)=~'^\s*#'`
`93`		`-letn=nextnonblank(n+1)`
`94`		`-endwhile`
`95`		`-let nind=indent(n)`
`96`		`-ifline=~'^\s*#'&&indent>=nind`
`97`		`-return-1`
`98`		`-elseifline=~'^\s*#'`
`99`		`-return nind / &shiftwidth`
`100`		`-else`
`101`		`-return blockindent / &shiftwidth`
	`50`	`+`
	`51`	`+ifindent==0`
	`52`	`+return0`
`102`	`53`	`endif`
	`54`	`+`
	`55`	`+return'='`
	`56`	`+`
`103`	`57`	`endfunction"}}}`
`104`	`58`
`105`	`59`

Movatterモバイル変換

File tree

58 files changed

Some content is hidden

58 files changed

‎Changelog.rst

‎autoload/pymode/folding.vim

‎pylibs/logilab/__init__.py

0 commit comments

`‎Changelog.rst`

`‎autoload/pymode/folding.vim`

`‎pylibs/logilab/init.py`