Fix meta placement after comment.

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
 
+* Fix adding meta to add it after comment of last present meta if present ([#102](https://github.com/avast/yaramod/issues/102), [#188](https://github.com/avast/yaramod/pull/188))
 * Separate includes and imports with blank lines ([#187](https://github.com/avast/yaramod/pull/187), [#130](https://github.com/avast/yaramod/issues/130))
 
 # v3.11.0 (2021-08-30)

src/types/rule.cpp

@@ -472,7 +472,15 @@ void Rule::addMeta(const std::string& name, const Literal& value)
 	else
 	{
 		insert_before = _metas.back().getValueTokenIt();
-		++insert_before;
+		while (
+			insert_before->getType() != TokenType::NEW_LINE &&
+			insert_before->getType() != TokenType::STRINGS &&
+			insert_before->getType() != TokenType::CONDITION &&
+			insert_before->getType() != TokenType::RULE_END &&
+			insert_before != _tokenStream->end()
+		) {
+			++insert_before;
+		}
 	}
 	_tokenStream->emplace(insert_before, TokenType::NEW_LINE, _tokenStream->getNewLineStyle());
 	auto itKey = _tokenStream->emplace(insert_before, TokenType::META_KEY, name);

tests/cpp/yaramod_tests.cpp

@@ -152,6 +152,36 @@ rule rule_with_added_metas
 )", yarafile->getTextFormatted());
 }
 
+TEST_F(YaramodTests,
+AddMetaToRulesWithComments) {
+	yaramod::Yaramod ymod;
+
+	std::stringstream input;
+	input << R"(
+	rule rule_with_commented_meta {
+		meta:
+			author = "Mr. Avastien" // added by Service
+		condition:
+			true
+	})";
+	auto yarafile = ymod.parseStream(input);
+
+	ASSERT_EQ(1u, yarafile->getRules().size());
+	const auto& rule = yarafile->getRules()[0];
+
+	rule->addMeta("bool_meta", Literal(false));
+	EXPECT_EQ(R"(
+rule rule_with_commented_meta
+{
+	meta:
+		author = "Mr. Avastien" // added by Service
+		bool_meta = false
+	condition:
+		true
+}
+)", yarafile->getTextFormatted());
+}
+
 TEST_F(YaramodTests,
 SetMeta) {
 	yaramod::Yaramod ymod;