feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

fix block highlighting off-by-one

Browse Source
This commit is contained in:
mae
2009-04-24 18:08:22 +02:00
parent 13c699e240
commit b9e376f5dd
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -3165,10 +3165,10 @@ bool TextBlockUserData::findPreviousOpenParenthesis(QTextCursor *cursor, bool se
return false; return false;
} }
bool TextBlockUserData::findPreviousBlockOpenParenthesis(QTextCursor *cursor) bool TextBlockUserData::findPreviousBlockOpenParenthesis(QTextCursor *cursor, bool checkStartPosition)
{ {
QTextBlock block = cursor->block(); QTextBlock block = cursor->block();
int position = cursor->position(); int position = cursor->position() + (checkStartPosition ? 1 : 0 );
int ignore = 0; int ignore = 0;
while (block.isValid()) { while (block.isValid()) {
Parentheses parenList = TextEditDocumentLayout::parentheses(block); Parentheses parenList = TextEditDocumentLayout::parentheses(block);
@@ -3399,10 +3399,12 @@ void BaseTextEditor::_q_highlightBlocks()
if (block.isValid()) { if (block.isValid()) {
QTextCursor cursor(block); QTextCursor cursor(block);
if (d->extraAreaHighlightCollapseColumn >= 0) if (d->extraAreaHighlightCollapseColumn >= 0)
cursor.setPosition(cursor.position() + qMin(d->extraAreaHighlightCollapseColumn+1, cursor.setPosition(cursor.position() + qMin(d->extraAreaHighlightCollapseColumn,
block.length())); block.length()));
QTextCursor closeCursor; QTextCursor closeCursor;
while (TextBlockUserData::findPreviousBlockOpenParenthesis(&cursor)) { bool firstRun = true;
while (TextBlockUserData::findPreviousBlockOpenParenthesis(&cursor), firstRun) {
firstRun = false;
highlightBlocksInfo.open.prepend(cursor.blockNumber()); highlightBlocksInfo.open.prepend(cursor.blockNumber());
highlightBlocksInfo.visualIndent.prepend(d->visualIndent(cursor.block())); highlightBlocksInfo.visualIndent.prepend(d->visualIndent(cursor.block()));
if (closeCursor.isNull()) if (closeCursor.isNull())

2
src/plugins/texteditor/basetexteditor.h
View File

@@ -167,7 +167,7 @@ public:
static bool findPreviousOpenParenthesis(QTextCursor *cursor, bool select = false); static bool findPreviousOpenParenthesis(QTextCursor *cursor, bool select = false);
static bool findNextClosingParenthesis(QTextCursor *cursor, bool select = false); static bool findNextClosingParenthesis(QTextCursor *cursor, bool select = false);
static bool findPreviousBlockOpenParenthesis(QTextCursor *cursor); static bool findPreviousBlockOpenParenthesis(QTextCursor *cursor, bool checkStartPosition = false);
static bool findNextBlockClosingParenthesis(QTextCursor *cursor); static bool findNextBlockClosingParenthesis(QTextCursor *cursor);