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

Improved the detection of #include-like directives.

Browse Source
This commit is contained in:
Roberto Raggi
2009-10-08 15:59:43 +02:00
parent b4a17a03c0
commit 510f8ccc3d
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/cpptools/cppcodecompletion.cpp
View File

@@ -690,21 +690,16 @@ static int startOfOperator(TextEditor::ITextEditable *editor,
} }
// Check for include preprocessor directive // Check for include preprocessor directive
else if (k == T_STRING_LITERAL || k == T_ANGLE_STRING_LITERAL || k == T_SLASH) { else if (k == T_STRING_LITERAL || k == T_ANGLE_STRING_LITERAL || k == T_SLASH) {
const QList<SimpleToken> &tokens = tokenUnderCursor.tokens();
int i = 0;
bool include = false; bool include = false;
for (; i < tokens.size(); ++i) { const QList<SimpleToken> &tokens = tokenUnderCursor.tokens();
const SimpleToken &token = tokens.at(i); if (tokens.size() >= 3) {
if (token.position() == tk.position()) { if (tokens.at(0).is(T_POUND) && tokens.at(1).is(T_IDENTIFIER) && (tokens.at(2).is(T_STRING_LITERAL) ||
if (i == 0) // no token on the left, but might be on a previous line tokens.at(2).is(T_ANGLE_STRING_LITERAL))) {
break; QStringRef directive = tokens.at(1).text();
const SimpleToken &previousToken = tokens.at(i - 1); if (directive == QLatin1String("include") ||
if (previousToken.is(T_IDENTIFIER)) { directive == QLatin1String("include_next") ||
if (previousToken.text() == QLatin1String("include") || directive == QLatin1String("import")) {
previousToken.text() == QLatin1String("import")) {
include = true; include = true;
break;
}
} }
} }
} }