add new and params of new

chumakd · Jul 3, 2014 · 27d774d · 27d774d
1 parent 69f8008
commit 27d774d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/bin/grep-function.pl b/bin/grep-function.pl
@@ -7,9 +7,15 @@
 my @vars = ();
 my $sub;
 my @params;
+my $new;
 for my $line ( @lines ) {
     if (  $line =~ /$pattern/o ) {
-        $sub = $1;
+        my $match = $1;
+        if ($line =~ /\bhas\b/ ) {
+            push @new, $match;
+        }
+        push @vars, $sub if $sub;
+        $sub = $match;
     }
     if ($line =~ /\$p_(\w+).+?(rq|op)\s*['"]\w+['"](?:\s*,\s*['"](\w+)['"])?(?:\s*,\s*(['"]?[^'";#]+['"]?))?(?:.*?#\s*(.+))/) {
         my $definition = '';
@@ -34,6 +40,8 @@
         @types = ();
     }
 }
+push @vars, $sub if $sub;
+push @vars, 'new(|'.(join '=>,|', @new ).'=>,|);Please_Redisplay' if @new;
 close FH;
 print $_  . "\n" for @vars;
 

diff --git a/ftplugin/perl/perlomni.vim b/ftplugin/perl/perlomni.vim
@@ -896,11 +896,11 @@ endf
 fun! s:scanFunctionFromList(lines)
     let buffile = tempname()
     cal writefile(a:lines,buffile)
-    return split(s:system(s:vimbin.'grep-function.pl', buffile, '^\s*(?:method|sub|has)\s+(\w+)', '|', 'sort', '|', 'uniq'),"\n")
+    return split(s:system(s:vimbin.'grep-function.pl', buffile, '^\s*(?:method|sub|has)\s+[''"]?(\w+)[''"]?', '|', 'sort', '|', 'uniq'),"\n")
 endf
 
 fun! s:scanFunctionFromSingleClassFile(file)
-    return split(s:system(s:vimbin.'grep-function.pl', a:file, '^\s*(?:method|sub|has)\s+(\w+)', '|', 'sort', '|', 'uniq'),"\n")
+    return split(s:system(s:vimbin.'grep-function.pl', a:file, '^\s*(?:method|sub|has)\s+[''"]?(\w+)[''"]?', '|', 'sort', '|', 'uniq'),"\n")
 endf
 
 fun! s:scanFunctionFromClass(class)
@@ -1123,7 +1123,7 @@ cal s:rule({
     \'comp': function('s:CompClassName') } )
 
 cal s:rule({
-    \'context': '^\s*\(sub\|method\)\s\+'              ,
+    \'context': '^\s*\(sub\|method|has\)\s\+'              ,
     \'backward': '\<\w\+$' ,
     \'only':1 ,
     \'comp': function('s:CompCurrentBaseFunction') })