diff options
| author | con <qtc-committer@nokia.com> | 2009-02-09 10:54:36 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-02-09 10:54:36 +0100 |
| commit | 1dcabe5a3ab7a0a854bca4ef918fa783c3d50328 (patch) | |
| tree | 96903311d87b20159f218d9447fe9beaab8c58f7 /src/plugins/texteditor/basetexteditor.cpp | |
| parent | 1f9bcd86e034bf57cd378b93880ebf9d3b6111e0 (diff) | |
| parent | 3b7c35fa9b452b17b986b719d1914263d472060d (diff) | |
| download | qt-creator-1dcabe5a3ab7a0a854bca4ef918fa783c3d50328.tar.gz | |
Merge branch '1.0.0'
Conflicts:
tests/auto/cplusplus/shared/shared.pri
tests/auto/cplusplus/shared/shared.pro
Diffstat (limited to 'src/plugins/texteditor/basetexteditor.cpp')
| -rw-r--r-- | src/plugins/texteditor/basetexteditor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 4cb4ec2177..a573477f32 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -3115,8 +3115,9 @@ bool TextBlockUserData::findPreviousOpenParenthesis(QTextCursor *cursor, bool se if (!parenList.isEmpty() && !TextEditDocumentLayout::ifdefedOut(block)) { for (int i = parenList.count()-1; i >= 0; --i) { Parenthesis paren = parenList.at(i); - if (block == cursor->block() && position - block.position() <= paren.pos + 1) - continue; + if (block == cursor->block() && + (position - block.position() <= paren.pos + (paren.type == Parenthesis::Closed ? 1 : 0))) + continue; if (paren.type == Parenthesis::Closed) { ++ignore; } else if (ignore > 0) { |