Fix #30: fixing pushing after empty lines

Author: sea5kg

CHANGELOG.md

@@ -5,11 +5,12 @@ All notable changes to wsjcpp-yaml project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [v0.1.10] - 2025-12-?? (2025 Dec ??)
+## [v0.1.10] - 2025-12-30 (2025 Dec 30)
 
 - Downgrade min c++ standart to C++11
 - Fixed #38: TODO escaping names
 - Fixed #24: Auto detect quotes on setValue setName
+- Fixed #30: fixing pushing after empty lines
 
 ## [v0.1.9] - 2025-12-18 (2025 Dec 18)
 

src/tests/test_append_element_issue_30.cpp

@@ -0,0 +1,67 @@
+/*
+MIT License
+
+Copyright (c) 2019-2025 wsjcpp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Official Source Code: https://github.com/wsjcpp/wsjcpp-yaml
+*/
+
+#include <iostream>
+#include <wsjcpp_yaml.h>
+
+int main() {
+
+    std::string sInput =
+        "some: \n"
+        "  - n1: 1\n"
+        "    n2: 2\n"
+        "\n"
+        "some2: r \n"
+    ;
+
+    WsjcppYaml yaml;
+    std::string sError;
+    if (!yaml.loadFromString("test_append_element_issue_30.yml", sInput, sError)) {
+        std::cerr << sError << std::endl;
+        return -1;
+    }
+
+    WsjcppYamlNode *pSome = yaml.getRoot()->getElement("some")->getElement(0);
+    pSome->setElementValue("n3", "3");
+
+    std::string sExpectedYaml =
+        "some:\n"
+        "  - n1: 1\n"
+        "    n2: 2\n"
+        "    n3: 3\n"
+        "\n"
+        "some2: r"
+    ;
+
+    std::string sSaved = yaml.getRoot()->toString();
+
+    if (sSaved != sExpectedYaml) {
+        std::cerr << "ERROR (1). Not equal. Expected: \n---\n" << sExpectedYaml << "\n---\n, but got \n---\n" << sSaved << "\n---\n" << std::endl;
+        return -1;
+    }
+
+    return 0;
+}

src/tests/test_keep_format.cpp

@@ -71,7 +71,7 @@ int main() {
     }
 
     if (sOutput != sInput) {
-        std::cerr << "sOutput != sInput" << std::endl;
+        std::cerr << "sOutput != sInput" << "Expected: \n-----\n" << sInput << "\n-----\nbut got: \n-----\n" << sOutput << "\n-----\n" << std::endl;
         return -1;
     }
 

src/wsjcpp_yaml.cpp

@@ -318,7 +318,20 @@ bool WsjcppYamlNode::setElement(const std::string &sName, WsjcppYamlNode *pItem)
             "(" + m_placeInFile.getFilename() + ":" + WSJCPP_INT_TO_STR(m_placeInFile.getNumberOfLine()) + ") "
             "already has element with this name: '" + sName + "'");
     }
-    m_vObjects.push_back(pItem); // TODO create clone
+
+    if (m_vObjects.size() == 0 || getParent() == WSJCPP_NULL) {
+        m_vObjects.push_back(pItem); // TODO create clone
+        return true;
+    }
+
+    // fix issue 30
+    WsjcppYamlNode *prevNode = m_vObjects[m_vObjects.size()-1];
+    if (prevNode != WSJCPP_NULL && prevNode->isEmpty() && prevNode->getComment() == "") {
+        m_vObjects[m_vObjects.size()-1] = pItem; // TODO create clone
+        m_vObjects.push_back(prevNode); // TODO create clone
+    } else {
+        m_vObjects.push_back(pItem); // TODO create clone
+    }
     return true;
 }