Commit 8045f9c

committed

fix(formatters: autopep8): remove redundant try/catch

1 parent 26c1d9b commit 8045f9cCopy full SHA for 8045f9c

File tree

1 file changed

-31

lines changed

autoload
- codefmt.vim

1 file changed

-31

lines changed

`‎autoload/codefmt.vim‎`

Lines changed: 9 additions & 31 deletions

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ if !exists('s:autopep8')`
`162`	`162`	`let s:autopep8 = {`
`163`	`163`	`\ 'name': 'autopep8',`
`164`	`164`	`\ 'setup_instructions': 'Install autopep8 ' .`
`165`		`- \ '(https://pypi.python.org/pypi/autopep8/).'}`
	`165`	`+ \ '(https://pypi.python.org/pypi/autopep8/).'}`
`166`	`166`
`167`	`167`	`function s:autopep8.IsAvailable() abort`
`168`	`168`	`return executable(s:plugin.Flag('autopep8_executable'))`
`@@ -172,53 +172,31 @@ if !exists('s:autopep8')`
`172`	`172`	`return &filetype is# 'python'`
`173`	`173`	`endfunction`
`174`	`174`
`175`		`-`
`176`	`175`	`""`
`177`	`176`	`" Reformat the current buffer with autopep8 or the binary named in`
`178`	`177`	`" @flag(autopep8_executable), only targeting the range between {startline} and`
`179`	`178`	`" {endline}.`
	`179`	`+ " @throws ShellError`
`180`	`180`	`function s:autopep8.FormatRange(startline, endline) abort`
`181`	`181`	`" Hack range formatting by formatting range individually, ignoring context.`
`182`	`182`	`let l:cmd = [ s:plugin.Flag('autopep8_executable'), "-" ]`
`183`	`183`	`call maktaba#ensure#IsNumber(a:startline)`
`184`	`184`	`call maktaba#ensure#IsNumber(a:endline)`
`185`	`185`	`let l:lines = getline(1, line('$'))`
`186`	`186`	`let l:input = join(l:lines[a:startline - 1 : a:endline - 1], "\n")`
`187`		`- try`
`188`		`- let l:result = maktaba#syscall#Create(l:cmd).WithStdin(l:input).Call()`
`189`		`- let l:formatted = split(l:result.stdout, "\n")`
`190`		`- " Special case empty slice: neither l:lines[:0] nor l:lines[:-1] is right.`
`191`		`- let l:before = a:startline > 1 ? l:lines[ : a:startline - 2] : []`
`192`	`187`
`193`		`- let l:full_formatted = l:before + l:formatted + l:lines[a:endline :]`
`194`		`- call maktaba#buffer#Overwrite(1, line('$'), l:full_formatted)`
`195`		`- catch /ERROR(ShellError):/`
`196`		`- " Parse all the errors and stick them in the quickfix list.`
`197`		`- let l:errors = []`
`198`		`- for l:line in split(v:exception, "\n")`
`199`		`- let l:tokens = matchlist(l:line,`
`200`		`- \ '\C\v^\<standard input\>:(\d+):(\d+):\s(.)')`
`201`		`- if !empty(l:tokens)`
`202`		`- call add(l:errors, {`
`203`		`- \ 'filename': @%,`
`204`		`- \ 'lnum': l:tokens[1] + a:startline - 1,`
`205`		`- \ 'col': l:tokens[2],`
`206`		`- \ 'text': l:tokens[3]})`
`207`		`- endif`
`208`		`- endfor`
	`188`	`+ let l:result = maktaba#syscall#Create(l:cmd).WithStdin(l:input).Call()`
	`189`	`+ let l:formatted = split(l:result.stdout, "\n")`
	`190`	`+ " Special case empty slice: neither l:lines[:0] nor l:lines[:-1] is right.`
	`191`	`+ let l:before = a:startline > 1 ? l:lines[ : a:startline - 2] : []`
`209`	`192`
`210`		`- if empty(l:errors)`
`211`		`- " Couldn't parse autopep8 error format; display it all.`
`212`		`- call maktaba#error#Shout('Error formatting file: %s', v:exception)`
`213`		`- else`
`214`		`- call setqflist(l:errors, 'r')`
`215`		`- cc 1`
`216`		`- endif`
`217`		`- endtry`
	`193`	`+ let l:full_formatted = l:before + l:formatted + l:lines[a:endline :]`
	`194`	`+ call maktaba#buffer#Overwrite(1, line('$'), l:full_formatted)`
`218`	`195`	`endfunction`
`219`	`196`
`220`	`197`	`call codefmtlib#AddDefaultFormatter(s:autopep8)`
`221`	`198`	`endif`
	`199`	`+`
`222`	`200`	`""`
`223`	`201`	`" Detects whether a formatter has been defined for the current buffer/filetype.`
`224`	`202`	`function! codefmt#IsFormatterAvailable() abort`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 8045f9c

File tree

1 file changed

1 file changed

`‎autoload/codefmt.vim‎`

0 commit comments