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

Re-enable check for automatically inserted block end.

Browse Source
This commit is contained in:
Roberto Raggi
2009-09-17 18:54:12 +02:00
parent da4fcd22ef
commit 9a799da6c9
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/cplusplus/MatchingText.cpp
View File

@@ -40,6 +40,7 @@ static bool maybeOverrideChar(const QChar &ch)
{ {
if (ch == QLatin1Char(')')) return true; if (ch == QLatin1Char(')')) return true;
else if (ch == QLatin1Char(']')) return true; else if (ch == QLatin1Char(']')) return true;
else if (ch == QLatin1Char(';')) return true;
else if (ch == QLatin1Char('"')) return true; else if (ch == QLatin1Char('"')) return true;
else if (ch == QLatin1Char('\'')) return true; else if (ch == QLatin1Char('\'')) return true;
else return false; else return false;
@@ -97,8 +98,6 @@ MatchingText::MatchingText()
QString MatchingText::insertMatchingBrace(const QTextCursor &cursor, const QString &textToProcess, QString MatchingText::insertMatchingBrace(const QTextCursor &cursor, const QString &textToProcess,
const QChar &la, int *skippedChars) const const QChar &la, int *skippedChars) const
{ {
*skippedChars = 0;
QTextCursor tc = cursor; QTextCursor tc = cursor;
QString text = textToProcess; QString text = textToProcess;

13
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -1270,16 +1270,25 @@ bool CPPEditor::isElectricCharacter(const QChar &ch) const
} }
#if 1 #if 1
QString CPPEditor::autoComplete(QTextCursor &cursor, const QString &text) const QString CPPEditor::autoComplete(QTextCursor &cursor, const QString &textToInsert) const
{ {
bool checkBlockEnd = m_allowSkippingOfBlockEnd;
m_allowSkippingOfBlockEnd = false;
if (!contextAllowsAutoParentheses(cursor)) if (!contextAllowsAutoParentheses(cursor))
return QString(); return QString();
QChar lookAhead = characterAt(cursor.selectionEnd()); QString text = textToInsert;
const QChar lookAhead = characterAt(cursor.selectionEnd());
QString autoText; QString autoText;
int skippedChars = 0; int skippedChars = 0;
if (checkBlockEnd && (lookAhead == QChar::ParagraphSeparator && (! text.isEmpty() && text.at(0) == QLatin1Char('}')))) {
skippedChars = 2;
text = text.mid(1);
}
MatchingText matchingText; MatchingText matchingText;
autoText = matchingText.insertMatchingBrace(cursor, text, lookAhead, &skippedChars); autoText = matchingText.insertMatchingBrace(cursor, text, lookAhead, &skippedChars);