Skip to content

Fixed a bug 21: remappings in normal mode #25

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
merged 1 commit into from
May 7, 2017
Merged

Fixed a bug 21: remappings in normal mode #25

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
64 changes: 32 additions & 32 deletions plugin/php-refactoring-toolbox.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,27 +108,27 @@ function! PhpDocAll() " {{{
call s:PhpEchoError(g:vim_php_refactoring_phpdoc . '() vim function doesn''t exists.')
return
endif
normal magg
normal! magg
while search(s:php_regex_class_line, 'eW') > 0
call s:PhpDocument()
endwhile
normal gg
normal! gg
while search(s:php_regex_member_line, 'eW') > 0
call s:PhpDocument()
endwhile
normal gg
normal! gg
while search(s:php_regex_func_line, 'eW') > 0
call s:PhpDocument()
endwhile
normal `a
normal! `a
endfunction
" }}}

function! PhpCreateGetters() " {{{
normal gg
normal! gg
let l:properties = []
while search(s:php_regex_member_line, 'eW') > 0
normal w"xye
normal! w"xye
call add(l:properties, @x)
endwhile
for l:property in l:properties
Expand All @@ -147,10 +147,10 @@ endfunction
" }}}

function! PhpCreateSettersAndGetters() " {{{
normal gg
normal! gg
let l:properties = []
while search(s:php_regex_member_line, 'eW') > 0
normal w"xye
normal! w"xye
call add(l:properties, @x)
endwhile
for l:property in l:properties
Expand Down Expand Up @@ -220,7 +220,7 @@ endfunction
" }}}

function! PhpExtractUse() " {{{
normal mr
normal! mr
let l:fqcn = s:PhpGetFQCNUnderCursor()
let l:use = s:PhpGetDefaultUse(l:fqcn)
let l:defaultUse = l:use
Expand All @@ -235,7 +235,7 @@ function! PhpExtractUse() " {{{
else
call s:PhpInsertUseStatement(l:fqcn)
endif
normal `r
normal! `r
endfunction
" }}}

Expand All @@ -245,15 +245,15 @@ function! PhpExtractConst() " {{{
return
endif
let l:name = toupper(inputdialog("Name of new const: "))
normal mrgv"xy
normal! mrgv"xy
call s:PhpReplaceInCurrentClass(@x, 'self::' . l:name)
call s:PhpInsertConst(l:name, @x)
normal `r
normal! `r
endfunction
" }}}

function! PhpExtractClassProperty() " {{{
normal mr
normal! mr
let l:name = substitute(expand('<cword>'), '^\$*', '', '')
call s:PhpReplaceInCurrentFunction('$' . l:name . '\>', '$this->' . l:name)
if g:vim_php_refactoring_auto_validate_visibility == 0
Expand All @@ -265,7 +265,7 @@ function! PhpExtractClassProperty() " {{{
let l:visibility = g:vim_php_refactoring_default_property_visibility
endif
call s:PhpInsertProperty(l:name, l:visibility)
normal `r
normal! `r
endfunction
" }}}

Expand All @@ -283,12 +283,12 @@ function! PhpExtractMethod() range " {{{
else
let l:visibility = g:vim_php_refactoring_default_method_visibility
endif
normal gv"xdmr
normal! gv"xdmr
let l:middleLine = line('.')
call search(s:php_regex_func_line, 'bW')
let l:startLine = line('.')
call search('(', 'W')
normal "pyi(
normal! "pyi(
call search('{', 'W')
exec "normal! %"
let l:stopLine = line('.')
Expand All @@ -310,7 +310,7 @@ function! PhpExtractMethod() range " {{{
call add(l:output, l:var)
endif
endfor
normal `r
normal! `r
if len(l:output) == 0
exec "normal! O$this->" . l:name . "(" . join(l:parameters, ", ") . ");\<ESC>k=3="
let l:return = ''
Expand All @@ -322,7 +322,7 @@ function! PhpExtractMethod() range " {{{
let l:return = "return array(" . join(l:output, ", ") . ");\<CR>"
endif
call s:PhpInsertMethod(l:visibility, l:name, l:parametersSignature, @x . l:return)
normal `r
normal! `r
endfunction
" }}}

Expand All @@ -341,7 +341,7 @@ endfunction
" }}}

function! PhpDetectUnusedUseStatements() " {{{
normal mrgg
normal! mrgg
while search('^use', 'W')
let l:startLine = line('.')
call search(';\_s*', 'eW')
Expand All @@ -355,7 +355,7 @@ function! PhpDetectUnusedUseStatements() " {{{
endif
endfor
endwhile
normal `r
normal! `r
endfunction
" }}}

Expand Down Expand Up @@ -390,34 +390,34 @@ endfunction

function! s:PhpDocument() " {{{
if match(getline(line('.')-1), "*/") == -1
normal mr
normal! mr
exec "call " . g:vim_php_refactoring_phpdoc . '()'
normal `r
normal! `r
endif
endfunction
" }}}

function! s:PhpReplaceInCurrentFunction(search, replace) " {{{
normal mr
normal! mr
call search(s:php_regex_func_line, 'bW')
let l:startLine = line('.')
call search('{', 'W')
exec "normal! %"
let l:stopLine = line('.')
exec l:startLine . ',' . l:stopLine . ':s/' . a:search . '/'. a:replace .'/ge'
normal `r
normal! `r
endfunction
" }}}

function! s:PhpReplaceInCurrentClass(search, replace) " {{{
normal mr
normal! mr
call search(s:php_regex_class_line, 'beW')
call search('{', 'W')
let l:startLine = line('.')
exec "normal! %"
let l:stopLine = line('.')
exec l:startLine . ',' . l:stopLine . ':s/' . a:search . '/'. a:replace .'/ge'
normal `r
normal! `r
endfunction
" }}}

Expand Down Expand Up @@ -447,7 +447,7 @@ function! s:PhpInsertConst(name, value) " {{{
else
call append(line('.'), 'const ' . a:name . ' = ' . a:value . ';')
endif
normal j=1=
normal! j=1=
endfunction
" }}}

Expand Down Expand Up @@ -475,7 +475,7 @@ function! s:PhpInsertPropertyExtended(name, visibility, insertLine, emptyLineBef
call append(a:insertLine + a:emptyLineBefore + 1, '* @var mixed')
call append(a:insertLine + a:emptyLineBefore + 2, '*/')
call append(a:insertLine + a:emptyLineBefore + 3, a:visibility . " $" . a:name . ';')
normal j=5=
normal! j=5=
endfunction
" }}}

Expand Down Expand Up @@ -515,25 +515,25 @@ endfunction
" }}}

function! s:PhpSearchInCurrentFunction(pattern, flags) " {{{
normal mr
normal! mr
call search(s:php_regex_func_line, 'bW')
let l:startLine = line('.')
call search('{', 'W')
exec "normal! %"
let l:stopLine = line('.')
normal `r
normal! `r
return s:PhpSearchInRange(a:pattern, a:flags, l:startLine, l:stopLine)
endfunction
" }}}

function! s:PhpSearchInCurrentClass(pattern, flags) " {{{
normal mr
normal! mr
call search(s:php_regex_class_line, 'beW')
call search('{', 'W')
let l:startLine = line('.')
exec "normal! %"
let l:stopLine = line('.')
normal `r
normal! `r
return s:PhpSearchInRange(a:pattern, a:flags, l:startLine, l:stopLine)
endfunction
" }}}
Expand Down