From 908a8d7b825a8d8501c595727c744dfeea874229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Youen=20P=C3=A9ron?= <youen.peron@cgi.com>
Date: Mon, 20 Nov 2023 09:15:58 +0000
Subject: [PATCH] fix: inner text at the end of parent element

---
 pkg/xixo/parser.go      |  2 ++
 pkg/xixo/parser_test.go | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/pkg/xixo/parser.go b/pkg/xixo/parser.go
index 63bf065..15a773a 100644
--- a/pkg/xixo/parser.go
+++ b/pkg/xixo/parser.go
@@ -506,6 +506,8 @@ search_close_tag:
 		if cur == '>' { // if tag name not found
 			if prev == '/' { // tag special close
 				result.autoClosable = true
+				result.outerTextBefore = string(x.scratchInnerText.bytes())
+				x.scratchInnerText.reset()
 
 				return result, true, nil
 			}
diff --git a/pkg/xixo/parser_test.go b/pkg/xixo/parser_test.go
index a932527..39e9aa6 100644
--- a/pkg/xixo/parser_test.go
+++ b/pkg/xixo/parser_test.go
@@ -233,6 +233,10 @@ func TestStreamWithoutModifications(t *testing.T) {
 		// {input: "<a>i<b>cb1</b>j<b>cb2</b>k<b>cb3</b>l</a>", element: "a"},
 		// {input: "<a>i<b>cb1</b>j<b>cb2</b>k</a>", element: "a"},
 
+		{input: "<a>\n<b>\n<d>contenta</d>\n</b>\n   <!-- comment --><c nil='true'/>\n</a>", element: "a"},
+
+		{input: "<a>\n<b>\n<d>content without attrbut</d>\n</b>\n<c/>\n</a>", element: "a"},
+
 		{input: "<a><b/>\n</a>", element: "a"},
 		{input: "<a><b/>\n</a>", element: "b"},
 
@@ -240,6 +244,14 @@ func TestStreamWithoutModifications(t *testing.T) {
 		{input: "<a><b/>\n<c/>\n</a>", element: "b"},
 		{input: "<a><b/>\n<c/>\n</a>", element: "c"},
 
+		{input: "<a>\n<b>\n<d>contenta</d>\n</b>\n<c xsi:nil=\"true\"/>\n</a>", element: "a"},
+		{input: "<a>\n<b>\n<d>contentb</d>\n</b>\n<c xsi:nil=\"true\" />\n</a>", element: "b"},
+		{input: "<a>\n<b>\n<d>contentc</d>\n</b>\n<c xsi:nil=\"true\" />\n</a>", element: "c"},
+
+		{input: " <a><b><d></d> </b>\n<c/>\n</a>", element: "a"},
+		{input: " <a><b> contenu </b>\n<c/>\n</a>", element: "b"},
+		{input: " <a><b> contenu </b>\n<c xsi:nil=\"true\" />\n</a>", element: "c"},
+
 		{input: "<a><b attr='true'/>\n</a>", element: "a"},
 		{input: "<a><b attr=\"true\"/>\n</a>", element: "a"},