Skip to content
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

Jump to bottom

Checking the value of variables instead of if it exists. #35

Merged
merged 4 commits into from
Apr 28, 2014
Merged

Checking the value of variables instead of if it exists. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36c08e5
1. Fixing variables to check the value not if it exists.
Apr 28, 2014
c3a3022
Merge remote-tracking branch 'upstream/master'
Apr 28, 2014
c4bee1d
1. Fixing the variable name.
Apr 28, 2014
97fa87e
1. Do not overwrite variables if already defined.
Apr 28, 2014
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
34 changes: 22 additions & 12 deletions ftplugin/php.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
" File: php.vim
" Description: PHP Integration for VIM plugin
" This file is a considerable fork of the original
" This file is a considerable fork of the original
" PDV written by Tobias Schlitt <toby@php.net>.
" Maintainer: Steve Francia <piv@spf13.com> <http://spf13.com>
" Version: 0.9
" Last Change: 7th January 2012
"
"
"
"
" Section: script init stuff {{{1
if exists("loaded_piv")
finish
Expand Down Expand Up @@ -35,11 +35,21 @@ endfunction

" {{{ Settings
" First the global PHP configuration
let php_sql_query=1 " to highlight SQL syntax in strings
let php_htmlInStrings=1 " to highlight HTML in string
let php_noShortTags = 1 " to disable short tags
let PHP_autoformatcomment = 1
let php_sync_method = -1
if (!exists('php_sql_query'))
let php_sql_query=1 " to highlight SQL syntax in strings
endif
if (!exists('php_html_in_strings'))
let php_html_in_strings=1 " to highlight HTML in string
endif
if (!exists('php_noShortTags'))
let php_noShortTags = 1 " to disable short tags
endif
if (!exists('php_autoformatcomment'))
let PHP_autoformatcomment = 1
endif
if (!exists('php_sync_method'))
let php_sync_method = -1
endif
if (!exists('php_folding'))
let php_folding = 1 "to enable folding for classes and functions
endif
Expand Down Expand Up @@ -152,15 +162,15 @@ func! PhpAlign() range
continue
endif
" \{-\} matches ungreed *
let l:index = substitute (getline (l:line), '^\s*\(.\{-\}\)\s*\S\{0,1}=\S\{0,1\}\s.*$', '\1', "")
let l:index = substitute (getline (l:line), '^\s*\(.\{-\}\)\s*\S\{0,1}=\S\{0,1\}\s.*$', '\1', "")
let l:indexlength = strlen (l:index)
let l:maxlength = l:indexlength > l:maxlength ? l:indexlength : l:maxlength
let l:line = l:line + 1
endwhile

let l:line = a:firstline
let l:format = "%s%-" . l:maxlength . "s %s %s"

while l:line <= l:endline
if getline (l:line) =~ '^\s*\/\/.*$'
let l:line = l:line + 1
Expand All @@ -178,7 +188,7 @@ func! PhpAlign() range
let &g:paste = l:paste
endfunc

" }}}
" }}}

function! s:CreateNMap(target, combo)
if !hasmapto(a:target, 'n')
Expand Down
10 changes: 5 additions & 5 deletions syntax/php.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
" Language: PHP 5.3 & up
" Maintainer: Paul Garvin <paul@paulgarvin.net>
" Last Change: April 2, 2010
" URL:
" URL:
"
" Former Maintainer: Peter Hodge <toomuchphp-vim@yahoo.com>
" Former URL: http://www.vim.org/scripts/script.php?script_id=1571
Expand Down Expand Up @@ -65,7 +65,7 @@ unlet! b:current_syntax
syntax spell default

" Set sync method if none declared
if !exists("php_sync_method")
if (!exists("php_sync_method") || php_sync_method==1)
if exists("php_minlines")
let php_sync_method=php_minlines
else
Expand All @@ -80,16 +80,16 @@ syn sync clear
unlet! b:current_syntax
syn cluster sqlTop remove=sqlString,sqlComment

if exists("php_sql_query")
if (!exists("php_sql_query") || php_sql_query==1)
syn cluster phpAddStrings contains=@sqlTop
endif

if exists("php_html_in_strings")
if (!exists("php_html_in_strings") || php_html_in_strings==1)
syn cluster phpAddStrings add=@htmlTop
endif

syn case match

" Superglobals
syn keyword phpSuperglobals GLOBALS _GET _POST _REQUEST _FILES _COOKIE _SERVER _SESSION _ENV HTTP_RAW_POST_DATA php_errormsg http_response_header argc argv contained

Expand Down