Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-28 17:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when trying to highlight matching bracket where its line was hidden.

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-12-29 12:37:45 -03:00
parent 4084e38e3c
commit a447da4002
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/eepp/ui/doc/documentview.cpp
View File

@@ -341,8 +341,9 @@ DocumentView::VisibleLineRange DocumentView::getVisibleLineRange( const TextPosi
}
eeASSERT( toIdx >= 0 );
info.visibleIndex = static_cast<VisibleIndex>( toIdx );
info.range = { { pos.line(), mVisibleLines[toIdx].column() },
mDoc->endOfLine( { pos.line(), 0ll } ) };
if ( info.visibleIndex != VisibleIndex::invalid )
info.range = { { pos.line(), mVisibleLines[toIdx].column() },
mDoc->endOfLine( { pos.line(), 0ll } ) };
return info;
}

5
src/eepp/ui/uicodeeditor.cpp
View File

@@ -2234,6 +2234,8 @@ Vector2d UICodeEditor::getTextPositionOffset( const TextPosition& position,
: 0.f );
double offsetY = mDocView.getLineYOffset( info.visibleIndex, lh );
if ( isNotMonospace() ) {
if ( !info.range.isValid() )
return {};
const auto& line = mDoc->line( position.line() ).getText();
auto partialLine =
line.view().substr( info.range.start().column(), info.range.end().column() );
@@ -3379,6 +3381,9 @@ void UICodeEditor::drawMatchingBrackets( const Vector2f& startScroll, const Floa
primitive.setForceDraw( false );
primitive.setColor( Color( mMatchingBracketColor ).blendAlpha( mAlpha ) );
auto drawBracket = [&]( const TextPosition& pos ) {
auto info = mDocView.getVisibleLineRange( pos );
if ( !info.range.isValid() )
return;
auto offset = getTextPositionOffset( pos, lineHeight );
primitive.drawRectangle(
Rectf( Vector2f( startScroll.x + offset.x, startScroll.y + offset.y ),