docstring-generator-ext 2.0.4__tar.gz → 2.0.5__tar.gz

{docstring_generator_ext-2.0.4 → docstring_generator_ext-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docstring_generator_ext
-Version: 2.0.4
+Version: 2.0.5
 Summary: Generate Docstrings with type-hint information.
 Author-email: FelixTheC <fberndt87@gmail.com>
 Classifier: Environment :: Console

{docstring_generator_ext-2.0.4 → docstring_generator_ext-2.0.5}/docstring_generator_ext.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docstring_generator_ext
-Version: 2.0.4
+Version: 2.0.5
 Summary: Generate Docstrings with type-hint information.
 Author-email: FelixTheC <fberndt87@gmail.com>
 Classifier: Environment :: Console

{docstring_generator_ext-2.0.4 → docstring_generator_ext-2.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "docstring_generator_ext"
-version = "2.0.4"
+version = "2.0.5"
 description = "Generate Docstrings with type-hint information."
 authors = [
     { name = "FelixTheC", email = "fberndt87@gmail.com" },

{docstring_generator_ext-2.0.4 → docstring_generator_ext-2.0.5}/src/docComparator.cpp

@@ -13,7 +13,10 @@ DocstringComparisonResult compare_docstrings(
     bool return_information_visible = false;
     bool exception_information_visible = false;
 
-    size_t last_pos = 0;
+    if (function_info.returns.type == "None" || function_info.returns.line_no == 0)
+        return_information_visible = true;
+
+    size_t last_pos = current_docstring.end_line - current_docstring.start_line;
 
     // check function arguments from FunctionInfo
     function_arguments_visible = std::ranges::all_of(
@@ -29,11 +32,17 @@ DocstringComparisonResult compare_docstrings(
                     last_pos = pos + arg.name.size();
             }
 
-            if (!arg.type.empty())
-                match &= current_docstring.docstring.find(arg.type, last_pos) != std::string::npos;
+            if (!arg.type.empty()) {
+                const auto pos = current_docstring.docstring.find(arg.type, last_pos);
+                match &= pos != std::string::npos;
+                if (pos != std::string::npos)
+                    last_pos = pos + arg.type.size();
+            }
 
-            if (!arg.default_value.empty())
+            if (!arg.default_value.empty()) {
                 match &= current_docstring.docstring.find(arg.default_value, last_pos) != std::string::npos;
+                last_pos += arg.default_value.size();
+            }
 
             if (!arg.description.empty()) {
                 const auto pos = current_docstring.docstring.find(arg.description, last_pos);
@@ -51,14 +60,9 @@ DocstringComparisonResult compare_docstrings(
         bool match = false;
         if (!function_info.returns.type.empty()) {
             const auto pos = current_docstring.docstring.find(function_info.returns.type, last_pos);
+            match = pos != std::string::npos;
             if (pos != std::string::npos) {
-                auto end_pos = current_docstring.docstring.find('\n', pos);
-                if (end_pos == std::string::npos)
-                    end_pos = current_docstring.docstring.size();
-                const auto tmp = current_docstring.docstring.substr(pos, end_pos);
-                last_pos = end_pos;
-                if (tmp.size() == function_info.returns.type.size())
-                    match = true;
+                last_pos = pos + function_info.returns.type.size() + function_info.returns.description.size();
             }
         }
 
@@ -70,12 +74,12 @@ DocstringComparisonResult compare_docstrings(
     // check exception information from FunctionInfo
     exception_information_visible = std::ranges::all_of(
         function_info.exceptions,
-        [&current_docstring](const auto &exception) {
+        [&last_pos, &current_docstring](const auto &exception) {
             bool match = false;
             if (!exception.name.empty())
-                match = current_docstring.docstring.find(exception.name) != std::string::npos;
+                match = current_docstring.docstring.find(exception.name, last_pos) != std::string::npos;
             if (!exception.description.empty())
-                match &= current_docstring.docstring.find(exception.description) != std::string::npos;
+                match &= current_docstring.docstring.find(exception.description, last_pos) != std::string::npos;
             return match;
         }
     );