kkoomen · kkoomen · Aug 12, 2023 · Aug 12, 2023 · Aug 12, 2023 · Aug 12, 2023
diff --git a/helper/Cargo.lock b/helper/Cargo.lock
diff --git a/helper/src/cpp/parser.rs b/helper/src/cpp/parser.rs
@@ -33,7 +33,7 @@ impl<'a> BaseParser for CppParser<'a> {
                             break;
                         }
 
-                        new_line -= 1;
+                        new_line = sibling_node.start_position().row + 1;
                         temp_node = sibling_node;
                     } else {
                       break;

diff --git a/helper/src/rust/parser.rs b/helper/src/rust/parser.rs
@@ -33,7 +33,7 @@ impl<'a> BaseParser for RustParser<'a> {
                             break;
                         }
 
-                        new_line -= 1;
+                        new_line = sibling_node.start_position().row + 1;
                         temp_node = sibling_nod
8000
e;
                     } else {
                       break;

diff --git a/test/filetypes/cpp/auto-functions.vader b/test/filetypes/cpp/auto-functions.vader
@@ -30,13 +30,17 @@ Expect cpp (generated comment with @brief, @tparam, @param and @return tags):
 # Auto-functions with parameters with type hints using return type 'auto'
 # ==============================================================================
 Given cpp (auto-function with parameters with advanced type hints using return type 'auto'):
-  template<class T, class U>
+  template<
+    class T,
+    class U
+  >
   auto add(T t, U u)
   {
     //
   }
 
 Do (trigger doge):
+  :5\<CR>
   \<C-d>
 
 Expect cpp (generated comment with @brief, @tparam, @param and @return tags):
@@ -48,7 +52,10 @@ Expect cpp (generated comment with @brief, @tparam, @param and @return tags):
    * @param[[TODO:direction]] t [TODO:description]
    * @param[[TODO:direction]] u [TODO:description]
    */
-  template<class T, class U>
+  template<
+    class T,
+    class U
+  >
   auto add(T t, U u)
   {
     //

diff --git a/test/filetypes/rust/functions.vader b/test/filetypes/rust/functions.vader
@@ -64,14 +64,17 @@ Expect rust (generated comments with Arguments and Examples sections):
 # ==============================================================================
 Given rust (impl methods with Errors and Safety section):
   #[debug]
-  #[macro_export]
+  #[foo(
+    bar=1,
+    baz=2
+  )]
   pub unsafe fn foo(foo: usize) -> Result<(), FooError> {
       fs::read_to_string("file.txt")
           .unwrap_or_else(|err| panic!("Failed to read filepath: {:?}", err));
   }
 
 Do (trigger doge):
-  :3\<CR>
+  :6\<CR>
   \<C-d>
 
 Expect rust (generated comments with Arguments, Safety, Errors and Examples sections):
@@ -99,7 +102,10 @@ Expect rust (generated comments with Arguments, Safety, Errors and Examples sect
   /// [TODO:write some example code]
   /// ```
   #[debug]
-  #[macro_export]
+  #[foo(
+    bar=1,
+    baz=2
+  )]
   pub unsafe fn foo(foo: usize) -> Result<(), FooError> {
       fs::read_to_string("file.txt")
           .unwrap_or_else(|err| panic!("Failed to read filepath: {:?}", err));