Commit7c2201f

Will Le

authored and

diraol

committed

Modify loclist

- Separate errors from warnings (errors are shown above warnings)- [g:pymode_lint_cwindow] open loclist only if there is at least one error (not warnings)- [g:pymode_lint_cwindow] jump to first errorChanges to be committed:modified: autoload/pymode/lint.vimmodified: autoload/pymode/tools/loclist.vimmodified: autoload/pymode/tools/signs.vimmodified: pymode/rope.py

1 parenta68a7a3 commit7c2201fCopy full SHA for 7c2201f

File tree

4 files changed

+30

-10

lines changed

autoload/pymode
- lint.vim
- tools
  - loclist.vim
  - signs.vim
pymode
- rope.py

4 files changed

+30

-10

lines changed

`‎autoload/pymode/lint.vim‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ fun! pymode#lint#check() "{{{`
`69`	`69`	`call loclist.show()`
`70`	`70`
`71`	`71`	`callpymode#lint#show_errormessage()`
`72`		`-callpymode#wide_message('Founderrors and warnings:' .len(loclist._loclist))`
	`72`	`+callpymode#wide_message('Found' . loclist.num_errors() .' error(s) and' .loclist.num_warnings() .' warning(s)')`
`73`	`73`
`74`	`74`	`endfunction" }}}`
`75`	`75`

`‎autoload/pymode/tools/loclist.vim‎`

Lines changed: 27 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,19 +24,37 @@ endfunction "}}}`
`24`	`24`
`25`	`25`
`26`	`26`	`fun!g:PymodeLocList.is_empty()"{{{`
`27`		`-returnempty(self._loclist)`
	`27`	`+returnempty(self._errlist)&&empty(self._warnlist)`
	`28`	`+endfunction"}}}`
	`29`	`+`
	`30`	`+fun!g:PymodeLocList.loclist()"{{{`
	`31`	`+let loclist=copy(self._errlist)`
	`32`	`+callextend(loclist,self._warnlist)`
	`33`	`+return loclist`
	`34`	`+endfunction"}}}`
	`35`	`+`
	`36`	`+fun!g:PymodeLocList.num_errors()"{{{`
	`37`	`+returnlen(self._errlist)`
	`38`	`+endfunction"}}}`
	`39`	`+`
	`40`	`+fun!g:PymodeLocList.num_warnings()"{{{`
	`41`	`+returnlen(self._warnlist)`
`28`	`42`	`endfunction"}}}`
`29`	`43`
`30`	`44`
`31`	`45`	`fun!g:PymodeLocList.clear()"{{{`
`32`		`-letself._loclist= []`
	`46`	`+letself._errlist= []`
	`47`	`+letself._warnlist= []`
`33`	`48`	`letself._messages= {}`
`34`	`49`	`letself._name=expand('%:t')`
`35`	`50`	`endfunction"}}}`
`36`	`51`
`37`	`52`
`38`	`53`	`fun!g:PymodeLocList.extend(raw_list)"{{{`
`39`		`-callextend(self._loclist,a:raw_list)`
	`54`	`+let err_list=filter(copy(a:raw_list),'v:val["type"] == "E"')`
	`55`	`+let warn_list=filter(copy(a:raw_list),'v:val["type"] != "E"')`
	`56`	`+callextend(self._errlist, err_list)`
	`57`	`+callextend(self._warnlist, warn_list)`
`40`	`58`	`for issueina:raw_list`
`41`	`59`	`letself._messages[issue.lnum]= issue.text`
`42`	`60`	`endfor`
`@@ -46,7 +64,7 @@ endfunction "}}}`
`46`	`64`
`47`	`65`	`fun!g:PymodeLocList.filter(filters)"{{{`
`48`	`66`	`let loclist= []`
`49`		`-forerrorinself._loclist`
	`67`	`+forerrorinself.loclist()`
`50`	`68`	`let passes_filters=1`
`51`	`69`	`forkeyinkeys(a:filters)`
`52`	`70`	`ifget(error,key,'')!=?a:filters[key]`
`@@ -65,8 +83,9 @@ endfunction "}}}`
`65`	`83`
`66`	`84`
`67`	`85`	`fun!g:PymodeLocList.show()"{{{`
`68`		`-callsetloclist(0,self._loclist)`
`69`		`-ifself.is_empty()`
	`86`	`+callsetloclist(0,self.loclist())`
	`87`	`+"if self.is_empty()`
	`88`	`+ifself.num_errors()==0`
`70`	`89`	`lclose`
`71`	`90`	`elseifg:pymode_lint_cwindow`
`72`	`91`	`let num=winnr()`
`@@ -77,5 +96,6 @@ fun! g:PymodeLocList.show() "{{{`
`77`	`96`	`callsetwinvar(winnr(),'quickfix_title',self._title .' <' .self._name .'>')`
`78`	`97`	`exe num ."wincmd w"`
`79`	`98`	`endif`
`80`		`-endif`
	`99`	`+lfirst`
	`100`	`+end`
`81`	`101`	`endfunction"}}}`

`‎autoload/pymode/tools/signs.vim‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ endfunction "}}}`
`46`	`46`
`47`	`47`	`fun!g:PymodeSigns.place(loclist)"{{{`
`48`	`48`	`let seen= {}`
`49`		`-for issueina:loclist._loclist`
	`49`	`+for issueina:loclist.loclist()`
`50`	`50`	`if!has_key(seen, issue.lnum)`
`51`	`51`	`let seen[issue.lnum]=1`
`52`	`52`	`calladd(self._sign_ids,self._next_id)`

`‎pymode/rope.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ def find_it():`
`184`	`184`	`text=env.lines[oc.lineno-1]ifoc.resource.real_path==env.curbuf.nameelse"",# noqa`
`185`	`185`	`lnum=oc.lineno,`
`186`	`186`	`))`
`187`		`-env.let('loclist._loclist',lst)`
	`187`	`+env.run('g:PymodeLocList.current().extend',lst)`
`188`	`188`
`189`	`189`
`190`	`190`	`defupdate_python_path(paths):`

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!

Commit7c2201f

File tree

4 files changed

4 files changed

`‎autoload/pymode/lint.vim‎`

`‎autoload/pymode/tools/loclist.vim‎`

`‎autoload/pymode/tools/signs.vim‎`

`‎pymode/rope.py‎`

0 commit comments