Skip to content

Add menu for different available refactorings #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomphp merged 1 commit into from
Dec 28, 2013
Merged

Add menu for different available refactorings #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ftplugin/php.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
vnoremap <buffer> <expr> <Leader>rem PhpRefactorExtractMethod()
noremap <buffer> <expr> <Leader>rlv PhpRefactorRenameLocalVariable()
noremap <buffer> <expr> <Leader>rli PhpRefactorLocalVariableToInstanceVariable()
noremap <buffer> <expr> <Leader>rou PhpRefactorOptimizeUse()
noremap <buffer> <Leader>r :call PhpRefactorShowMenu()<CR>
42 changes: 31 additions & 11 deletions plugin/phprefactor.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,45 @@ if !exists("g:php_refactor_patch_command")
let g:php_refactor_patch_command='patch -p1'
endif

func! PhpRefactorExtractMethod()
func! PhpRefactorShowMenu() range
echohl Title
echo 'Available Refactorings:'
echohl None
echo '(em) Extract Method'
echo '(lv) rename Local Variable'
echo '(li) Local variable to Instance variable'
echo '(ou) Optimize Use'
echo ''
echo '(c) Cancel'
echo ''

let choice = nr2char(getchar())
if choice == 'c'
return
endif
let choice = choice . nr2char(getchar())

if choice == 'em'
call PhpRefactorExtractMethod(a:firstline, a:lastline)
elseif choice == 'lv'
call PhpRefactorRenameLocalVariable()
elseif choice == 'li'
call PhpRefactorLocalVariableToInstanceVariable()
elseif choice == 'ou'
call PhpRefactorOptimizeUse()
endif
endfunc

func! PhpRefactorExtractMethod(startline, endline)
" check the file has been saved
if &modified
echom 'Cannot refactor; file contains unsaved changes'
return
endif

let startLine = line('v')
let endLine = line('.')
let method = input('Enter extracted method name: ')

" check line numbers are the right way around
if startLine > endLine
let temp = startLine
let startLine = endLine
let endLine = temp
endif

let range = startLine . '-' . endLine
let range = a:startline . '-' . a:endline

let args = [range, method]

Expand Down