Merge pull request #613 from kkoomen/feature/fix-cpp-default-param

fix(cpp): resolve default param case
kkoomen · Aug 15, 2023 · 88fdd3a · 88fdd3a
2 parents a9148bc + 5c87d7b
commit 88fdd3a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/helper/Cargo.lock b/helper/Cargo.lock
diff --git a/helper/src/cpp/parser.rs b/helper/src/cpp/parser.rs
@@ -160,12 +160,17 @@ impl<'a> CppParser<'a> {
                             }
                         }
                     }
-
-                    if node.kind() == "identifier" {
-                        param.insert("name".to_string(), Value::String(self.get_node_text(&node)));
-                    }
                 });
 
+                let name = node
+                    .children(&mut node.walk())
+                    .filter(|node| node.kind() == "identifier")
+                    .next()
+                    .and_then(|node| Some(self.get_node_text(&node)));
+                if name.is_some(){
+                    param.insert("name".to_string(), Value::String(name.unwrap()));
+                }
+
                 params.push(Value::Object(param));
             });
 

diff --git a/test/filetypes/cpp/functions.vader b/test/filetypes/cpp/functions.vader
@@ -88,3 +88,23 @@ Expect cpp (generated comment with @brief and @param tag):
   int* fun1(int a,int b,int c){
       return nullptr;
   }
+
+# ==============================================================================
+# Functions with a default value
+# ==============================================================================
+Given cpp (function with a default value):
+  int y = 5;
+  void foo( int x = y );
+
+Do (trigger doge):
+  :2\<CR>
+  \<C-d>
+
+Expect cpp (generated comment with @brief and @param tag):
+  int y = 5;
+  /**
+   * @brief [TODO:summary]
+   *
+   * @param[[TODO:direction]] x [TODO:description]
+   */
+  void foo( int x = y );