From 98ed9c0b672cd741cc92b57c0d5bf9d59434c359 Mon Sep 17 00:00:00 2001 From: therealgaxbo Date: Tue, 25 Nov 2014 12:41:48 +0000 Subject: [PATCH 1/2] Fix type-guessing bools from default value Regex was enclosed in double quotes, so backslash-escaping of metachars was ineffective. Switch to single quotes. --- autoload/pdv.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/pdv.vim b/autoload/pdv.vim index 777672a..4faa3b3 100644 --- a/autoload/pdv.vim +++ b/autoload/pdv.vim @@ -65,7 +65,7 @@ let s:regex["types"]["array"] = "^array *(.*" let s:regex["types"]["float"] = '^[0-9]*\.[0-9]\+' let s:regex["types"]["int"] = '^[0-9]\+' let s:regex["types"]["string"] = "['\"].*" -let s:regex["types"]["bool"] = "\(true\|false\)" +let s:regex["types"]["bool"] = '\(true\|false\)' let s:regex["indent"] = '^\s*' From e7aacb0d42e71cd6df1f591d5a0de53b09e4f082 Mon Sep 17 00:00:00 2001 From: therealgaxbo Date: Tue, 25 Nov 2014 12:43:03 +0000 Subject: [PATCH 2/2] Make type guessing case-insensitive PHP allows array, true and false keywords to be any case, so make regex for those keywords case insensitive --- autoload/pdv.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/autoload/pdv.vim b/autoload/pdv.vim index 4faa3b3..dba9f86 100644 --- a/autoload/pdv.vim +++ b/autoload/pdv.vim @@ -61,11 +61,11 @@ let s:regex["class"] = '^\(\s*\)\(\S*\)\s*\(interface\|class\)\s*\(\S\+\)\s*\([^ let s:regex["types"] = {} -let s:regex["types"]["array"] = "^array *(.*" +let s:regex["types"]["array"] = '^array *(.*\c' let s:regex["types"]["float"] = '^[0-9]*\.[0-9]\+' let s:regex["types"]["int"] = '^[0-9]\+' let s:regex["types"]["string"] = "['\"].*" -let s:regex["types"]["bool"] = '\(true\|false\)' +let s:regex["types"]["bool"] = '\(true\|false\)\c' let s:regex["indent"] = '^\s*'