feat: Revert .\+ to .\{-} for php

kkoomen · Jun 4, 2019 · aa0a5b1 · aa0a5b1
1 parent a80c3b6
commit aa0a5b1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/ftplugin/php.vim b/ftplugin/php.vim
@@ -54,7 +54,7 @@ call add(b:doge_patterns, {
 "     $arg5 = NULL
 "   ) {}
 call add(b:doge_patterns, {
-\  'match': '\m^\%(\%(public\|private\|protected\)\s\+\)\?\%(\%(static\)\s\+\)\?\%(\%(final\)\s\+\)\?function\s*\([^(]\+\)\s*(\(.\+\))\s*{',
+\  'match': '\m^\%(\%(public\|private\|protected\)\s\+\)\?\%(\%(static\)\s\+\)\?\%(\%(final\)\s\+\)\?function\s*\([^(]\+\)\s*(\(.\{-}\))\s*{',
 \  'match_group_names': ['funcName', 'parameters'],
 \  'parameters': {
 \    'match': '\m\%(\([[:alnum:]_\\]\+\)\s\+\)\?&\?\($[[:alnum:]_]\+\)\%(\s*=\s*[^,]\+\)\?',

diff --git a/test/languages/php/class-methods.vader b/test/languages/php/class-methods.vader
@@ -12,9 +12,13 @@ Do (trigger doge):
   :3\<CR>
   \<C-d>
 
-Expect php (no changes):
+Expect php (class method with nothing but the text 'TODO'):
   class Test {
 
+    /**
+     * TODO
+     *
+     */
     public function myMethod() {}
 
   }
@@ -35,7 +39,7 @@ Do (trigger doge):
   :3\<CR>
   \<C-d>
 
-Expect php (generated comment with param tags):
+Expect php (generated comment with @param tags):
   class Test {
 
     /**
@@ -59,7 +63,7 @@ Do (trigger doge):
   :3\<CR>
   \<C-d>
 
-Expect php (generated comment with param tags):
+Expect php (generated comment with @param tags):
   class Test {
 
     /**
@@ -83,7 +87,7 @@ Do (trigger doge):
   :3\<CR>
   \<C-d>
 
-Expect php (generated comment with param tags):
+Expect php (generated comment with @param tags):
   class Test {
 
     /**
@@ -107,7 +111,7 @@ Do (trigger doge):
   :3\<CR>
   \<C-d>
 
-Expect php (generated comment with param tags):
+Expect php (generated comment with @param tags):
   class Test {
 
     /**
@@ -136,7 +140,7 @@ Do (trigger doge):
   :5\<CR>
   \<C-d>
 
-Expect php (generated comment with param tags):
+Expect php (generated comment with @param tags):
   use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
   class Test {

diff --git a/test/languages/php/functions.vader b/test/languages/php/functions.vader
@@ -7,7 +7,11 @@ Given php (function without parameters):
 Do (trigger doge):
   \<C-d>
 
-Expect php (no changes):
+Expect php (function with nothing but the text 'TODO'):
+  /**
+   * TODO
+   *
+   */
   function myFunc() {}
 
 # ==============================================================================
@@ -19,7 +23,7 @@ Given php (function with parameters):
 Do (trigger doge):
   \<C-d>
 
-Expect php (generated comment with param tags):
+Expect php (generated comment with @param tags):
   /**
    * TODO
    *