Commitcf8ddc7

committed

Switch to loclist

1 parent3485b69 commitcf8ddc7Copy full SHA for cf8ddc7

File tree

+42

-13

lines changed

+42

-13

lines changed

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,13 +110,17 @@ fun! pymode#buffer_pre_write() "{{{`
`110`	`110`	`endfunction`
`111`	`111`
`112`	`112`	`fun!pymode#buffer_post_write()"{{{`
`113`		`-ifb:pymode_modified&&g:pymode_rope_regenerate_on_write`
`114`		`-callpymode#debug('regenerate')`
`115`		`-callpymode#rope#regenerate()`
	`113`	`+ifg:pymode_rope`
	`114`	`+ifb:pymode_modified&&g:pymode_rope_regenerate_on_write`
	`115`	`+callpymode#debug('regenerate')`
	`116`	`+callpymode#rope#regenerate()`
	`117`	`+endif`
`116`	`118`	`endif`
`117`		`-ifg:pymode_lint_unmodified\|\| (g:pymode_lint_on_write&&b:pymode_modified)`
`118`		`-callpymode#debug('check code')`
`119`		`-callpymode#lint#check()`
	`119`	`+ifg:pymode_lint`
	`120`	`+ifg:pymode_lint_unmodified\|\| (g:pymode_lint_on_write&&b:pymode_modified)`
	`121`	`+callpymode#debug('check code')`
	`122`	`+callpymode#lint#check()`
	`123`	`+endif`
`120`	`124`	`endif`
`121`	`125`	`endfunction"}}}`
`122`	`126`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,7 @@ fun! pymode#lint#check() "{{{`
`65`	`65`	`callg:PymodeSigns.refresh(loclist)`
`66`	`66`
`67`	`67`	`ifg:pymode_lint_cwindow`
`68`		`-callsetqflist(loclist._loclist)`
`69`		`-callpymode#quickfix_open(0,g:pymode_quickfix_maxheight,g:pymode_quickfix_minheight,0)`
	`68`	`+call loclist.show()`
`70`	`69`	`endif`
`71`	`70`
`72`	`71`	`callpymode#lint#show_errormessage()`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`"`
`3`	`3`	`PymodePython from pymodeimport rope`
`4`	`4`
	`5`	`+callpymode#tools#loclist#init()`
	`6`	`+`
`5`	`7`
`6`	`8`	`fun!pymode#rope#completions(findstart, base)`
`7`	`9`	`PymodePython rope.completions()`
`@@ -56,8 +58,10 @@ fun! pymode#rope#find_it()`
`56`	`58`	`PymodePython rope.find_it()`
`57`	`59`	`callpymode#wide_message('')`
`58`	`60`	`if!empty(l:output)`
`59`		`-callsetqflist(l:output)`
`60`		`-callpymode#quickfix_open(0,g:pymode_quickfix_maxheight,g:pymode_quickfix_minheight,0)`
	`61`	`+let loclist=g:PymodeLocList.current()`
	`62`	`+let loclist._loclist=l:output`
	`63`	`+let loclist._title="Occurrences"`
	`64`	`+call loclist.show()`
`61`	`65`	`end`
`62`	`66`	`endfunction`
`63`	`67`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ let s:efm .= '%-G%.%#'`
`43`	`43`
`44`	`44`	`PymodePython from pymode.runimport run_code`
`45`	`45`
	`46`	`+callpymode#tools#loclist#init()`
	`47`	`+`
`46`	`48`
`47`	`49`	`" DESC: Run python code`
`48`	`50`	`fun!pymode#run#code_run(line1, line2)"{{{`
`@@ -86,7 +88,11 @@ fun! pymode#run#code_run(line1, line2) "{{{`
`86`	`88`	`callsetqflist(qflist)`
`87`	`89`	`endif`
`88`	`90`
`89`		`-callpymode#quickfix_open(0,g:pymode_quickfix_maxheight,g:pymode_quickfix_maxheight,0)`
	`91`	`+let loclist=g:PymodeLocList.current()`
	`92`	`+let loclist._loclist=getqflist()`
	`93`	`+let loclist._title="Run errors"`
	`94`	`+call loclist.show()`
	`95`	`+`
`90`	`96`	`let &efm=l:_efm`
`91`	`97`
`92`	`98`	`catch/E234/`

Lines changed: 18 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ fun! g:PymodeLocList.init(raw_list) "{{{`
`10`	`10`	`let obj=copy(self)`
`11`	`11`	`let loc_list=filter(copy(a:raw_list),'v:val["valid"] == 1')`
`12`	`12`	`call obj.clear()`
	`13`	`+let obj._title='CodeCheck'`
`13`	`14`	`return obj`
`14`	`15`	`endfunction"}}}`
`15`	`16`
`@@ -18,7 +19,6 @@ fun! g:PymodeLocList.current() "{{{`
`18`	`19`	`if!exists("b:pymode_loclist")`
`19`	`20`	`letb:pymode_loclist=g:PymodeLocList.init([])`
`20`	`21`	`endif`
`21`		`-letb:pymode_loclist._bufnr=bufnr('.')`
`22`	`22`	`returnb:pymode_loclist`
`23`	`23`	`endfunction"}}}`
`24`	`24`
`@@ -31,7 +31,7 @@ endfunction "}}}`
`31`	`31`	`fun!g:PymodeLocList.clear()"{{{`
`32`	`32`	`letself._loclist= []`
`33`	`33`	`letself._messages= {}`
`34`		`-letself._bufnr=bufnr('')`
	`34`	`+letself._name=expand('%:t')`
`35`	`35`	`endfunction"}}}`
`36`	`36`
`37`	`37`
`@@ -62,3 +62,19 @@ fun! g:PymodeLocList.filter(filters) "{{{`
`62`	`62`	`endfor`
`63`	`63`	`return loclist`
`64`	`64`	`endfunction"}}}`
	`65`	`+`
	`66`	`+`
	`67`	`+fun!g:PymodeLocList.show()"{{{`
	`68`	`+callsetloclist(0,self._loclist)`
	`69`	`+ifself.is_empty()`
	`70`	`+lclose`
	`71`	`+else`
	`72`	`+let num=winnr()`
	`73`	`+execute"lopen" .g:pymode_quickfix_maxheight`
	`74`	`+executemax([min([line("$"),g:pymode_quickfix_maxheight]),g:pymode_quickfix_minheight]) ."wincmd _"`
	`75`	`+if num!=winnr()`
	`76`	`+callsetwinvar(winnr(),'quickfix_title',self._title .' <' .self._name .'>')`
	`77`	`+wincmdp`
	`78`	`+endif`
	`79`	`+end`
	`80`	`+endfunction"}}}`

Comments

(0)