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

Pass the lookahead character to matching text.

Browse Source
This commit is contained in:
Roberto Raggi
2009-09-17 18:39:10 +02:00
parent 82b80b9e39
commit da4fcd22ef
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,10 +71,31 @@ static bool isCompleteCharLiteral(const BackwardsScanner &tk, int index, int sta
return false;
}
static bool shouldInsertMatchingText(const QChar &lookAhead)
{
if (lookAhead.isSpace())
return true;
else if (lookAhead == QLatin1Char('{'))
return true;
else if (lookAhead == QLatin1Char('}'))
return true;
else if (lookAhead == QLatin1Char(']'))
return true;
else if (lookAhead == QLatin1Char(')'))
return true;
else if (lookAhead == QLatin1Char(';'))
return true;
else if (lookAhead == QLatin1Char(','))
return true;
return false;
}
MatchingText::MatchingText()
{ }
QString MatchingText::insertMatchingBrace(const QTextCursor &cursor, const QString &textToProcess, int *skippedChars) const
QString MatchingText::insertMatchingBrace(const QTextCursor &cursor, const QString &textToProcess,
const QChar &la, int *skippedChars) const
{
*skippedChars = 0;
@@ -101,7 +122,7 @@ QString MatchingText::insertMatchingBrace(const QTextCursor &cursor, const QStri
text = textToProcess.mid(*skippedChars);
}
if (text.isEmpty())
if (text.isEmpty() || !shouldInsertMatchingText(la))
return QString();
BackwardsScanner tk(tc, textToProcess.left(*skippedChars), MAX_NUM_LINES);

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

@@ -41,7 +41,8 @@ class CPLUSPLUS_EXPORT MatchingText
public:
MatchingText();
QString insertMatchingBrace(const QTextCursor &tc, const QString &text, int *skippedChars) const;
QString insertMatchingBrace(const QTextCursor &tc, const QString &text,
const QChar &la, int *skippedChars) const;
QString insertParagraphSeparator(const QTextCursor &tc) const;
};

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

@@ -1275,11 +1275,13 @@ QString CPPEditor::autoComplete(QTextCursor &cursor, const QString &text) const
if (!contextAllowsAutoParentheses(cursor))
return QString();
QChar lookAhead = characterAt(cursor.selectionEnd());
QString autoText;
int skippedChars = 0;
MatchingText matchingText;
autoText = matchingText.insertMatchingBrace(cursor, text, &skippedChars);
autoText = matchingText.insertMatchingBrace(cursor, text, lookAhead, &skippedChars);
if (skippedChars) {
const int pos = cursor.position();