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

Editor: Fix finding block parentheses.

Browse Source 
The '[' and ']' characters were considered block-opening/closing. That
led to bad results in the autocompleter (the only user of these
functions).

Task-number: QTCREATORBUG-8031
Change-Id: I81b464b2591d3695baad6e9630f9bcc4aa4ef795
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Christian Kamm
2012-10-14 10:42:49 +02:00
parent 9f1d8b66e3
commit 9f737301b4
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/texteditor/basetextdocumentlayout.cpp
View File

@@ -390,8 +390,7 @@ bool TextBlockUserData::findPreviousBlockOpenParenthesis(QTextCursor *cursor, bo
for (int i = parenList.count()-1; i >= 0; --i) { for (int i = parenList.count()-1; i >= 0; --i) {
Parenthesis paren = parenList.at(i); Parenthesis paren = parenList.at(i);
if (paren.chr != QLatin1Char('{') && paren.chr != QLatin1Char('}') if (paren.chr != QLatin1Char('{') && paren.chr != QLatin1Char('}')
&& paren.chr != QLatin1Char('+') && paren.chr != QLatin1Char('-') && paren.chr != QLatin1Char('+') && paren.chr != QLatin1Char('-'))
&& paren.chr != QLatin1Char('[') && paren.chr != QLatin1Char(']'))
continue; continue;
if (block == cursor->block()) { if (block == cursor->block()) {
if (position - block.position() <= paren.pos + (paren.type == Parenthesis::Closed ? 1 : 0)) if (position - block.position() <= paren.pos + (paren.type == Parenthesis::Closed ? 1 : 0))
@@ -454,8 +453,7 @@ bool TextBlockUserData::findNextBlockClosingParenthesis(QTextCursor *cursor)
for (int i = 0; i < parenList.count(); ++i) { for (int i = 0; i < parenList.count(); ++i) {
Parenthesis paren = parenList.at(i); Parenthesis paren = parenList.at(i);
if (paren.chr != QLatin1Char('{') && paren.chr != QLatin1Char('}') if (paren.chr != QLatin1Char('{') && paren.chr != QLatin1Char('}')
&& paren.chr != QLatin1Char('+') && paren.chr != QLatin1Char('-') && paren.chr != QLatin1Char('+') && paren.chr != QLatin1Char('-'))
&& paren.chr != QLatin1Char('[') && paren.chr != QLatin1Char(']'))
continue; continue;
if (block == cursor->block() && if (block == cursor->block() &&
(position - block.position() > paren.pos - (paren.type == Parenthesis::Opened ? 1 : 0))) (position - block.position() > paren.pos - (paren.type == Parenthesis::Opened ? 1 : 0)))