From 966e475b4c31d68e08857b602344616039d5e8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= <spartanj@gmail.com>
Date: Sun, 7 Sep 2025 00:20:27 -0300
Subject: [PATCH] Fix for toggle-block-comments when using it with a single
 line selection.

---
 src/eepp/ui/doc/textdocument.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/eepp/ui/doc/textdocument.cpp b/src/eepp/ui/doc/textdocument.cpp
index 591d97078..00f3adfb7 100644
--- a/src/eepp/ui/doc/textdocument.cpp
+++ b/src/eepp/ui/doc/textdocument.cpp
@@ -3731,6 +3731,7 @@ void TextDocument::toggleBlockComments() {
 		TextRange oriRange = getSelectionIndex( i );
 		TextRange range = getSelectionIndex( i, true );
 		bool needsSwap = oriRange != range;
+		bool sameLine = range.start().line() == range.end().line();
 
 		if ( !range.hasSelection() ) {
 			setSelection( i, insert( i, range.start(), openStrPadded + closeStrPadded ) );
@@ -3743,11 +3744,17 @@ void TextDocument::toggleBlockComments() {
 									  positionOffset( range.start(), openLenPadded ) };
 		TextRange closeRangePadded = { positionOffset( range.end(), -closeLenPadded ),
 									   range.end() };
+
 		if ( openRangePadded.end() <= closeRangePadded.start() &&
 			 getText( openRangePadded ) == openStrPadded &&
 			 getText( closeRangePadded ) == closeStrPadded ) {
 			remove( i, closeRangePadded );
 			remove( i, openRangePadded );
+			if ( sameLine &&
+				 closeRangePadded.start() == sanitizePosition( closeRangePadded.start() ) ) {
+				closeRangePadded.setStart(
+					positionOffset( closeRangePadded.start(), -openLenPadded ) );
+			}
 			setSelection( i, needsSwap ? closeRangePadded.start() : range.start(),
 						  needsSwap ? range.start() : closeRangePadded.start() );
 			continue;
@@ -3759,13 +3766,17 @@ void TextDocument::toggleBlockComments() {
 			 getText( closeRange ) == closeStr ) {
 			remove( i, closeRange );
 			remove( i, openRange );
+			if ( sameLine && closeRange.start() == sanitizePosition( closeRange.start() ) )
+				closeRange.setStart( positionOffset( closeRange.start(), -openLen ) );
 			setSelection( i, needsSwap ? closeRange.start() : range.start(),
 						  needsSwap ? range.start() : closeRange.start() );
 		} else {
 			auto start =
 				positionOffset( insert( i, range.start(), openStrPadded ), -openLenPadded );
-			insert( i, range.end(), closeStrPadded );
-			auto end = positionOffset( range.end(), closeLenPadded );
+			insert( i, sameLine ? positionOffset( range.end(), openLenPadded ) : range.end(),
+					closeStrPadded );
+			auto end =
+				positionOffset( range.end(), closeLenPadded + ( sameLine ? openLenPadded : 0 ) );
 			setSelection( i, needsSwap ? end : start, needsSwap ? start : end );
 		}
 	}