From bdd0169c3c576be4b9e2640fe13a3e7b6a1baf32 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 5 Oct 2009 16:20:06 +0200
Subject: [PATCH] Don't override escaped quotes.
---
src/libs/cplusplus/MatchingText.cpp | 40 +++++++++++++++++++++++------
1 file changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp
index bbbb06b8311..20aa34f0683 100644
--- a/src/libs/cplusplus/MatchingText.cpp
+++ b/src/libs/cplusplus/MatchingText.cpp
@@ -104,21 +104,43 @@ QString MatchingText::insertMatchingBrace(const QTextCursor &cursor, const QStri
const QChar &la, int *skippedChars) const
{
QTextCursor tc = cursor;
+ QTextDocument *doc = tc.document();
QString text = textToProcess;
const QString blockText = tc.block().text().mid(tc.columnNumber());
const int length = qMin(blockText.length(), textToProcess.length());
- for (int i = 0; i < length; ++i) {
- const QChar ch1 = blockText.at(i);
- const QChar ch2 = textToProcess.at(i);
+ const QChar previousChar = doc->characterAt(tc.selectionEnd() - 1);
- if (ch1 != ch2)
- break;
- else if (! shouldOverrideChar(ch1))
- break;
+ bool escape = false;
+
+ if (! text.isEmpty() && (text.at(0) == QLatin1Char('"') ||
+ text.at(0) == QLatin1Char('\''))) {
+ if (previousChar == QLatin1Char('\\')) {
+ int escapeCount = 0;
+ int index = tc.selectionEnd() - 1;
+ do {
+ ++escapeCount;
+ --index;
+ } while (doc->characterAt(index) == QLatin1Char('\\'));
- ++*skippedChars;
+ if ((escapeCount % 2) != 0)
+ escape = true;
+ }
+ }
+
+ if (! escape) {
+ for (int i = 0; i < length; ++i) {
+ const QChar ch1 = blockText.at(i);
+ const QChar ch2 = textToProcess.at(i);
+
+ if (ch1 != ch2)
+ break;
+ else if (! shouldOverrideChar(ch1))
+ break;
+
+ ++*skippedChars;
+ }
}
if (*skippedChars != 0) {
@@ -142,6 +164,8 @@ QString MatchingText::insertMatchingBrace(const QTextCursor &cursor, const QStri
if (isCompleteStringLiteral(tk, index - 1))
return QLatin1String("\"");
+ qDebug() << "*** here";
+
return QString();
} else if (text.at(0) == QLatin1Char('\'') && (token.is(T_CHAR_LITERAL) || token.is(T_WIDE_CHAR_LITERAL))) {
if (text.length() != 1)
--
GitLab