Skip to content

Fix g:phpfmt_options problem and fit for phpcbf version 3 #6

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

Open
zurazurataicho wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix g:phpfmt_options problem and fit for phpcbf version 3 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f43ff84
Fixed g:phpfmt_options not to use default if it is set on .vimrc
zurazurataicho Nov 1, 2017
4785712
Fixed l:tmpname to fit phpcbf version 3
zurazurataicho Nov 1, 2017
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
2 changes: 1 addition & 1 deletion autoload/phpfmt/fmt.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function! phpfmt#fmt#format() abort "{{{
endif
let l:tmpname = g:phpfmt_tmp_dir . expand('%')
else
let l:tmpname = tempname()
let l:tmpname = tempname() . '.' . expand('%:e')
endif
call writefile(getline(1, '$'), l:tmpname)

Expand Down
10 changes: 9 additions & 1 deletion plugin/phpfmt.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,17 @@ if !exists('g:phpfmt_command')
endif

if !exists('g:phpfmt_standard')
let g:phpfmt_options = '--standard=PSR2 --encoding=utf-8'
let g:phpfmt_standard = 'PSR2'
else
let phpmfm_standard_is_specified = 1
endif

if !exists('g:phpfmt_options')
let g:phpfmt_options = '--standard=' . g:phpfmt_standard . ' --encoding=utf-8'
else
if exists('phpmfm_standard_is_specified')
let g:phpfmt_options = '--standard=' . g:phpfmt_standard . ' ' . g:phpfmt_options
endif
endif

if !exists("g:phpfmt_experimental")
Expand Down