Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-04 20:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix for toggle-block-comments when using it with a single line selection.

Browse Source
This commit is contained in:
Martín Lucas Golini
2025-09-07 00:20:27 -03:00
parent 97dad52da1
commit 966e475b4c
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/eepp/ui/doc/textdocument.cpp
View File

@@ -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 );
}
}