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

C++: Accept language features in BackwardsScanner et al

Browse Source 
Change-Id: Id97ca27fa909979573efca12dc0cd14b28eacd17
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-26 09:14:38 +02:00
committed by Orgad Shaneh
parent 1a37605f91
commit d63624afe0
15 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/cplusplus/BackwardsScanner.cpp
View File

@@ -38,6 +38,7 @@
using namespace CPlusPlus; using namespace CPlusPlus;
BackwardsScanner::BackwardsScanner(const QTextCursor &cursor, BackwardsScanner::BackwardsScanner(const QTextCursor &cursor,
const LanguageFeatures &languageFeatures,
int maxBlockCount, int maxBlockCount,
const QString &suffix, const QString &suffix,
bool skipComments) bool skipComments)
@@ -46,13 +47,7 @@ BackwardsScanner::BackwardsScanner(const QTextCursor &cursor,
, _block(cursor.block()) , _block(cursor.block())
, _maxBlockCount(maxBlockCount) , _maxBlockCount(maxBlockCount)
{ {
// FIXME: Why these defaults? _tokenize.setLanguageFeatures(languageFeatures);
LanguageFeatures features;
features.qtMocRunEnabled = true;
features.qtEnabled = true;
features.qtKeywordsEnabled = true;
features.objCEnabled = true;
_tokenize.setLanguageFeatures(features);
_tokenize.setSkipComments(skipComments); _tokenize.setSkipComments(skipComments);
_text = _block.text().left(cursor.position() - cursor.block().position()); _text = _block.text().left(cursor.position() - cursor.block().position());

9
src/libs/cplusplus/BackwardsScanner.h
View File

@@ -43,10 +43,11 @@ class CPLUSPLUS_EXPORT BackwardsScanner
enum { MAX_BLOCK_COUNT = 10 }; enum { MAX_BLOCK_COUNT = 10 };
public: public:
explicit BackwardsScanner(const QTextCursor &cursor, BackwardsScanner(const QTextCursor &cursor,
int maxBlockCount = MAX_BLOCK_COUNT, const LanguageFeatures &languageFeatures,
const QString &suffix = QString(), int maxBlockCount = MAX_BLOCK_COUNT,
bool skipComments = true); const QString &suffix = QString(),
bool skipComments = true);
int startToken() const; int startToken() const;

7
src/libs/cplusplus/ExpressionUnderCursor.cpp
View File

@@ -40,8 +40,9 @@
using namespace CPlusPlus; using namespace CPlusPlus;
ExpressionUnderCursor::ExpressionUnderCursor() ExpressionUnderCursor::ExpressionUnderCursor(const LanguageFeatures &languageFeatures)
: _jumpedComma(false) : _jumpedComma(false)
, _languageFeatures(languageFeatures)
{ } { }
int ExpressionUnderCursor::startOfExpression(BackwardsScanner &tk, int index) int ExpressionUnderCursor::startOfExpression(BackwardsScanner &tk, int index)
@@ -243,7 +244,7 @@ bool ExpressionUnderCursor::isAccessToken(const Token &tk)
QString ExpressionUnderCursor::operator()(const QTextCursor &cursor) QString ExpressionUnderCursor::operator()(const QTextCursor &cursor)
{ {
BackwardsScanner scanner(cursor); BackwardsScanner scanner(cursor, _languageFeatures);
_jumpedComma = false; _jumpedComma = false;
@@ -257,7 +258,7 @@ QString ExpressionUnderCursor::operator()(const QTextCursor &cursor)
int ExpressionUnderCursor::startOfFunctionCall(const QTextCursor &cursor) const int ExpressionUnderCursor::startOfFunctionCall(const QTextCursor &cursor) const
{ {
BackwardsScanner scanner(cursor); BackwardsScanner scanner(cursor, _languageFeatures);
int index = scanner.startToken(); int index = scanner.startToken();

4
src/libs/cplusplus/ExpressionUnderCursor.h
View File

@@ -32,6 +32,7 @@
#define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H #define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
#include <cplusplus/CPlusPlusForwardDeclarations.h> #include <cplusplus/CPlusPlusForwardDeclarations.h>
#include <cplusplus/Token.h>
#include <QList> #include <QList>
@@ -47,7 +48,7 @@ class BackwardsScanner;
class CPLUSPLUS_EXPORT ExpressionUnderCursor class CPLUSPLUS_EXPORT ExpressionUnderCursor
{ {
public: public:
ExpressionUnderCursor(); ExpressionUnderCursor(const LanguageFeatures &languageFeatures);
QString operator()(const QTextCursor &cursor); QString operator()(const QTextCursor &cursor);
int startOfFunctionCall(const QTextCursor &cursor) const; int startOfFunctionCall(const QTextCursor &cursor) const;
@@ -59,6 +60,7 @@ private:
private: private:
bool _jumpedComma; bool _jumpedComma;
LanguageFeatures _languageFeatures;
}; };
} // namespace CPlusPlus } // namespace CPlusPlus

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

@@ -154,7 +154,8 @@ QString MatchingText::insertMatchingBrace(const QTextCursor &cursor, const QStri
if (text.isEmpty() || !shouldInsertMatchingText(la)) if (text.isEmpty() || !shouldInsertMatchingText(la))
return QString(); return QString();
BackwardsScanner tk(tc, MAX_NUM_LINES, textToProcess.left(*skippedChars)); BackwardsScanner tk(tc, LanguageFeatures::defaultFeatures(), MAX_NUM_LINES,
textToProcess.left(*skippedChars));
const int startToken = tk.startToken(); const int startToken = tk.startToken();
int index = startToken; int index = startToken;
@@ -215,7 +216,7 @@ static bool shouldInsertNewline(const QTextCursor &tc)
QString MatchingText::insertParagraphSeparator(const QTextCursor &tc) QString MatchingText::insertParagraphSeparator(const QTextCursor &tc)
{ {
BackwardsScanner tk(tc, MAX_NUM_LINES); BackwardsScanner tk(tc, LanguageFeatures::defaultFeatures(), MAX_NUM_LINES);
int index = tk.startToken(); int index = tk.startToken();
if (tk[index - 1].isNot(T_LBRACE)) if (tk[index - 1].isNot(T_LBRACE))

2
src/plugins/analyzerbase/analyzerutils.cpp
View File

@@ -79,7 +79,7 @@ CPlusPlus::Symbol *AnalyzerUtils::findSymbolUnderCursor()
QTC_ASSERT(doc, return 0); QTC_ASSERT(doc, return 0);
// fetch the expression's code // fetch the expression's code
CPlusPlus::ExpressionUnderCursor expressionUnderCursor; CPlusPlus::ExpressionUnderCursor expressionUnderCursor(doc->languageFeatures());
moveCursorToEndOfName(&tc); moveCursorToEndOfName(&tc);
const QString &expression = expressionUnderCursor(tc); const QString &expression = expressionUnderCursor(tc);
CPlusPlus::Scope *scope = doc->scopeAt(line, column); CPlusPlus::Scope *scope = doc->scopeAt(line, column);

6
src/plugins/clangcodemodel/clangcompletion.cpp
View File

@@ -639,7 +639,7 @@ int ClangCompletionAssistProcessor::startCompletionHelper()
return m_startPosition; return m_startPosition;
} }
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(m_interface->languageFeatures());
QTextCursor tc(m_interface->textDocument()); QTextCursor tc(m_interface->textDocument());
if (m_model->m_completionOperator == T_COMMA) { if (m_model->m_completionOperator == T_COMMA) {
@@ -705,7 +705,7 @@ int ClangCompletionAssistProcessor::startOfOperator(int pos,
} }
if (*kind == T_COMMA) { if (*kind == T_COMMA) {
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(m_interface->languageFeatures());
if (expressionUnderCursor.startOfFunctionCall(tc) == -1) { if (expressionUnderCursor.startOfFunctionCall(tc) == -1) {
*kind = T_EOF_SYMBOL; *kind = T_EOF_SYMBOL;
start = pos; start = pos;
@@ -931,7 +931,7 @@ int ClangCompletionAssistProcessor::startCompletionInternal(const QString fileNa
QTextCursor tc(m_interface->textDocument()); QTextCursor tc(m_interface->textDocument());
tc.setPosition(index); tc.setPosition(index);
ExpressionUnderCursor euc; ExpressionUnderCursor euc(m_interface->languageFeatures());
index = euc.startOfFunctionCall(tc); index = euc.startOfFunctionCall(tc);
int nameStart = findStartOfName(index); int nameStart = findStartOfName(index);
QTextCursor tc2(m_interface->textDocument()); QTextCursor tc2(m_interface->textDocument());

2
src/plugins/cppeditor/cppcanonicalsymbol.cpp
View File

@@ -77,7 +77,7 @@ Scope *CanonicalSymbol::getScopeAndExpression(const QTextCursor &cursor, QString
++pos; ++pos;
tc.setPosition(pos); tc.setPosition(pos);
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(m_document->languageFeatures());
*code = expressionUnderCursor(tc); *code = expressionUnderCursor(tc);
return m_document->scopeAt(line, column); return m_document->scopeAt(line, column);
} }

2
src/plugins/cppeditor/cppelementevaluator.cpp
View File

@@ -102,7 +102,7 @@ void CppElementEvaluator::execute()
CppTools::moveCursorToEndOfIdentifier(&m_tc); CppTools::moveCursorToEndOfIdentifier(&m_tc);
// Fetch the expression's code // Fetch the expression's code
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(doc->languageFeatures());
const QString &expression = expressionUnderCursor(m_tc); const QString &expression = expressionUnderCursor(m_tc);
Scope *scope = doc->scopeAt(line, column); Scope *scope = doc->scopeAt(line, column);

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

@@ -615,7 +615,7 @@ 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; ExpressionUnderCursor expressionUnderCursor(features);
QString expression = expressionUnderCursor(tc); QString expression = expressionUnderCursor(tc);
for (int pos = tc.position();; ++pos) { for (int pos = tc.position();; ++pos) {

14
src/plugins/cpptools/cppcompletionassist.cpp
View File

@@ -168,7 +168,7 @@ static bool isDereferenced(TextEditorWidget *editorWidget, int basePosition)
QTextCursor cursor = editorWidget->textCursor(); QTextCursor cursor = editorWidget->textCursor();
cursor.setPosition(basePosition); cursor.setPosition(basePosition);
BackwardsScanner scanner(cursor); BackwardsScanner scanner(cursor, LanguageFeatures());
for (int pos = scanner.startToken()-1; pos >= 0; pos--) { for (int pos = scanner.startToken()-1; pos >= 0; pos--) {
switch (scanner[pos].kind()) { switch (scanner[pos].kind()) {
case T_COLON_COLON: case T_COLON_COLON:
@@ -670,7 +670,7 @@ private:
QTextCursor cursor(m_assistInterface->textDocument()); QTextCursor cursor(m_assistInterface->textDocument());
cursor.setPosition(m_position + 1); cursor.setPosition(m_position + 1);
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(m_assistInterface->languageFeatures());
const QString expression = expressionUnderCursor(cursor); const QString expression = expressionUnderCursor(cursor);
if (expression.isEmpty()) if (expression.isEmpty())
return false; return false;
@@ -951,7 +951,7 @@ int InternalCppCompletionAssistProcessor::startOfOperator(int pos,
} }
if (*kind == T_COMMA) { if (*kind == T_COMMA) {
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(m_interface->languageFeatures());
if (expressionUnderCursor.startOfFunctionCall(tc) == -1) { if (expressionUnderCursor.startOfFunctionCall(tc) == -1) {
*kind = T_EOF_SYMBOL; *kind = T_EOF_SYMBOL;
start = pos; start = pos;
@@ -1099,7 +1099,7 @@ int InternalCppCompletionAssistProcessor::startCompletionHelper()
return m_startPosition; return m_startPosition;
} }
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(m_interface->languageFeatures());
QTextCursor tc(m_interface->textDocument()); QTextCursor tc(m_interface->textDocument());
if (m_model->m_completionOperator == T_COMMA) { if (m_model->m_completionOperator == T_COMMA) {
@@ -1173,7 +1173,7 @@ bool InternalCppCompletionAssistProcessor::tryObjCCompletion()
QTextCursor tc(m_interface->textDocument()); QTextCursor tc(m_interface->textDocument());
tc.setPosition(end); tc.setPosition(end);
BackwardsScanner tokens(tc); BackwardsScanner tokens(tc, m_interface->languageFeatures());
if (tokens[tokens.startToken() - 1].isNot(T_RBRACKET)) if (tokens[tokens.startToken() - 1].isNot(T_RBRACKET))
return false; return false;
@@ -1439,7 +1439,7 @@ int InternalCppCompletionAssistProcessor::startCompletionInternal(const QString
QTextCursor tc(m_interface->textDocument()); QTextCursor tc(m_interface->textDocument());
tc.setPosition(index); tc.setPosition(index);
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(m_interface->languageFeatures());
const QString baseExpression = expressionUnderCursor(tc); const QString baseExpression = expressionUnderCursor(tc);
// Resolve the type of this expression // Resolve the type of this expression
@@ -2086,7 +2086,7 @@ bool InternalCppCompletionAssistProcessor::completeConstructorOrFunction(const Q
QTextCursor tc(m_interface->textDocument()); QTextCursor tc(m_interface->textDocument());
tc.setPosition(endOfExpression); tc.setPosition(endOfExpression);
BackwardsScanner bs(tc); BackwardsScanner bs(tc, m_interface->languageFeatures());
const int startToken = bs.startToken(); const int startToken = bs.startToken();
int lineStartToken = bs.startOfLine(startToken); int lineStartToken = bs.startOfLine(startToken);
// make sure the required tokens are actually available // make sure the required tokens are actually available

18
src/plugins/debugger/sourceutils.cpp
View File

@@ -286,6 +286,9 @@ QString cppExpressionAt(TextEditorWidget *editorWidget, int pos,
if (function) if (function)
function->clear(); function->clear();
const QString fileName = editorWidget->textDocument()->filePath().toString();
const Snapshot snapshot = CppModelManager::instance()->snapshot();
const Document::Ptr document = snapshot.document(fileName);
QTextCursor tc = editorWidget->textCursor(); QTextCursor tc = editorWidget->textCursor();
QString expr = tc.selectedText(); QString expr = tc.selectedText();
if (expr.isEmpty()) { if (expr.isEmpty()) {
@@ -295,21 +298,18 @@ QString cppExpressionAt(TextEditorWidget *editorWidget, int pos,
tc.movePosition(QTextCursor::EndOfWord); tc.movePosition(QTextCursor::EndOfWord);
// Fetch the expression's code. // Fetch the expression's code.
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(document ? document->languageFeatures()
: LanguageFeatures::defaultFeatures());
expr = expressionUnderCursor(tc); expr = expressionUnderCursor(tc);
} }
*column = tc.positionInBlock(); *column = tc.positionInBlock();
*line = tc.blockNumber() + 1; *line = tc.blockNumber() + 1;
if (!expr.isEmpty()) { if (!expr.isEmpty() && document) {
QString fileName = editorWidget->textDocument()->filePath().toString(); QString func = document->functionAt(*line, *column, scopeFromLine, scopeToLine);
const Snapshot snapshot = CppModelManager::instance()->snapshot(); if (function)
if (const Document::Ptr document = snapshot.document(fileName)) { *function = func;
QString func = document->functionAt(*line, *column, scopeFromLine, scopeToLine);
if (function)
*function = func;
}
} }
return expr; return expr;

3
src/plugins/glsleditor/glslcompletionassist.cpp
View File

@@ -263,7 +263,8 @@ IAssistProposal *GlslCompletionAssistProcessor::perform(const AssistInterface *i
while (ch.isLetterOrNumber() || ch == QLatin1Char('_')) while (ch.isLetterOrNumber() || ch == QLatin1Char('_'))
ch = m_interface->characterAt(--pos); ch = m_interface->characterAt(--pos);
CPlusPlus::ExpressionUnderCursor expressionUnderCursor; CPlusPlus::ExpressionUnderCursor expressionUnderCursor(
CPlusPlus::LanguageFeatures::defaultFeatures());
//GLSLTextEditorWidget *edit = qobject_cast<GLSLTextEditorWidget *>(editor->widget()); //GLSLTextEditorWidget *edit = qobject_cast<GLSLTextEditorWidget *>(editor->widget());
QList<GLSL::Symbol *> members; QList<GLSL::Symbol *> members;

2
src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp
View File

@@ -987,7 +987,7 @@ static QString createConstructor(ClassSpecifierAST *classAST)
bool checkGenerated(const QTextCursor &cursor, int *doxyStart) bool checkGenerated(const QTextCursor &cursor, int *doxyStart)
{ {
BackwardsScanner tokens(cursor, 10, QString(), false); BackwardsScanner tokens(cursor, LanguageFeatures::defaultFeatures(), 10, QString(), false);
Token prevToken = tokens.LA(1); Token prevToken = tokens.LA(1);
if (prevToken.kind() != T_DOXY_COMMENT && prevToken.kind() != T_CPP_DOXY_COMMENT) if (prevToken.kind() != T_DOXY_COMMENT && prevToken.kind() != T_CPP_DOXY_COMMENT)
return false; return false;

10
tests/auto/cplusplus/semantic/tst_semantic.cpp
View File

@@ -532,7 +532,7 @@ void tst_Semantic::expression_under_cursor_1()
QTextCursor tc(&textDocument); QTextCursor tc(&textDocument);
tc.movePosition(QTextCursor::End); tc.movePosition(QTextCursor::End);
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(LanguageFeatures::defaultFeatures());
const QString expression = expressionUnderCursor(tc); const QString expression = expressionUnderCursor(tc);
QCOMPARE(expression, QString("bar")); QCOMPARE(expression, QString("bar"));
@@ -548,7 +548,7 @@ void tst_Semantic::bracketed_expression_under_cursor_1()
QTextCursor tc(&textDocument); QTextCursor tc(&textDocument);
tc.movePosition(QTextCursor::End); tc.movePosition(QTextCursor::End);
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(LanguageFeatures::defaultFeatures());
const QString expression = expressionUnderCursor(tc); const QString expression = expressionUnderCursor(tc);
QCOMPARE(expression, QString("i")); QCOMPARE(expression, QString("i"));
@@ -564,7 +564,7 @@ void tst_Semantic::bracketed_expression_under_cursor_2()
QTextCursor tc(&textDocument); QTextCursor tc(&textDocument);
tc.movePosition(QTextCursor::End); tc.movePosition(QTextCursor::End);
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(LanguageFeatures::defaultFeatures());
const QString expression = expressionUnderCursor(tc); const QString expression = expressionUnderCursor(tc);
QCOMPARE(expression, plainText); QCOMPARE(expression, plainText);
@@ -580,7 +580,7 @@ void tst_Semantic::bracketed_expression_under_cursor_3()
QTextCursor tc(&textDocument); QTextCursor tc(&textDocument);
tc.movePosition(QTextCursor::End); tc.movePosition(QTextCursor::End);
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(LanguageFeatures::defaultFeatures());
const QString expression = expressionUnderCursor(tc); const QString expression = expressionUnderCursor(tc);
QCOMPARE(expression, QString("[receiver message")); QCOMPARE(expression, QString("[receiver message"));
@@ -596,7 +596,7 @@ void tst_Semantic::bracketed_expression_under_cursor_4()
QTextCursor tc(&textDocument); QTextCursor tc(&textDocument);
tc.movePosition(QTextCursor::End); tc.movePosition(QTextCursor::End);
ExpressionUnderCursor expressionUnderCursor; ExpressionUnderCursor expressionUnderCursor(LanguageFeatures::defaultFeatures());
const QString expression = expressionUnderCursor(tc); const QString expression = expressionUnderCursor(tc);
QCOMPARE(expression, QString("i")); QCOMPARE(expression, QString("i"));