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

CppEditor: Extract some functions

Browse Source 
Change-Id: Ie564c35b106981d986881f12495ca3cab578c720
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-03-11 11:21:45 +01:00
parent 4e1d281963
commit 3ab5e5231c
1 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
View File

@@ -395,6 +395,36 @@ Symbol *findDefinition(Symbol *symbol, const Snapshot &snapshot, SymbolFinder *s
return symbolFinder->findMatchingDefinition(symbol, snapshot); return symbolFinder->findMatchingDefinition(symbol, snapshot);
} }
void maybeAppendArgumentOrParameterList(QString *expression, const QTextCursor &textCursor)
{
QTC_ASSERT(expression, return);
QTextDocument *textDocument = textCursor.document();
QTC_ASSERT(textDocument, return);
// Skip white space
QTextCursor cursor(textCursor);
while (textDocument->characterAt(cursor.position()).isSpace()
&& cursor.movePosition(QTextCursor::NextCharacter)) {
}
// Find/Include (...)
if (textDocument->characterAt(cursor.position()) == QLatin1Char('(')) {
if (TextBlockUserData::findNextClosingParenthesis(&cursor, true))
expression->append(cursor.selectedText());
}
}
QString expressionUnderCursorAsString(const QTextCursor &textCursor,
const LanguageFeatures &features)
{
ExpressionUnderCursor expressionUnderCursor(features);
QString expression = expressionUnderCursor(textCursor);
maybeAppendArgumentOrParameterList(&expression, textCursor);
return expression;
}
} // anonymous namespace } // anonymous namespace
FollowSymbolUnderCursor::FollowSymbolUnderCursor(CppEditorWidget *widget) FollowSymbolUnderCursor::FollowSymbolUnderCursor(CppEditorWidget *widget)
@@ -613,22 +643,8 @@ TextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &curs
return link; return link;
// Evaluate the type of the expression under the cursor // Evaluate the type of the expression under the cursor
ExpressionUnderCursor expressionUnderCursor(features); QTC_CHECK(document == tc.document());
QString expression = expressionUnderCursor(tc); const QString expression = expressionUnderCursorAsString(tc, features);
for (int pos = tc.position();; ++pos) {
const QChar ch = document->characterAt(pos);
if (ch.isSpace())
continue;
if (ch == QLatin1Char('(') && !expression.isEmpty()) {
tc.setPosition(pos);
if (TextBlockUserData::findNextClosingParenthesis(&tc, true))
expression.append(tc.selectedText());
}
break;
}
const QSharedPointer<TypeOfExpression> typeOfExpression(new TypeOfExpression); const QSharedPointer<TypeOfExpression> typeOfExpression(new TypeOfExpression);
typeOfExpression->init(doc, snapshot); typeOfExpression->init(doc, snapshot);
// make possible to instantiate templates // make possible to instantiate templates